{"id":3952,"url":"https://patchwork.libcamera.org/api/patches/3952/?format=json","web_url":"https://patchwork.libcamera.org/patch/3952/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200605141002.49119-9-jacopo@jmondi.org>","date":"2020-06-05T14:10:02","name":"[libcamera-devel,v3,8/8] android: camera_device: Report frame durations","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"c0b07d828d638251fe8dbdaf199b4ac956197ab9","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/3952/mbox/","series":[{"id":958,"url":"https://patchwork.libcamera.org/api/series/958/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=958","date":"2020-06-05T14:09:54","name":"android: Build stream configuration map","version":3,"mbox":"https://patchwork.libcamera.org/series/958/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3952/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3952/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DC7CD60410\n\tfor ;\n\tFri, 5 Jun 2020 16:07:13 +0200 (CEST)","from localhost.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 761E820006;\n\tFri, 5 Jun 2020 14:07:13 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Jun 2020 16:10:02 +0200","Message-Id":"<20200605141002.49119-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200605141002.49119-1-jacopo@jmondi.org>","References":"<20200605141002.49119-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 8/8] android: camera_device: Report\n\tframe durations","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 05 Jun 2020 14:07:14 -0000"},"content":"Report the minimum frame durations for each collected stream\nconfiguration by inspecting the camera reported FrameDurationLimits\nproperty.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 33 +++++++++++++++++++++++++++++----\n src/android/camera_device.h | 3 ++-\n 2 files changed, 31 insertions(+), 5 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex bbfc2464c908..fdcbada754f6 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -175,7 +175,7 @@ int CameraDevice::initialize()\n \t\treturn ret;\n \t}\n \n-\tret = initializeStreamConfigurations();\n+\tret = initializeStreamConfigurations(properties);\n \tcamera_->release();\n \treturn ret;\n }\n@@ -186,8 +186,27 @@ int CameraDevice::initialize()\n * stream configurations to be reported to the Android camera framework through\n * the static stream configuration metadata.\n */\n-int CameraDevice::initializeStreamConfigurations()\n+int CameraDevice::initializeStreamConfigurations(const ControlList &properties)\n {\n+\t/*\n+\t * Collect minimum frame durations from the camera. Default to it\n+\t * 33.3 msec if the camera does not report frame duration information.\n+\t *\n+\t * \\todo The frame durations interval reported by the camera through the\n+\t * FrameDurationLimits property represents the camera minimum and\n+\t * maximum durations, regardless of the currently configured image\n+\t * format and resolution. As we are currently missing an API to report\n+\t * the frame durations for a specific configuration and Android requires\n+\t * the minimum frame duration to be reported per-configuration, as of\n+\t * now report the duration value for all supported stream\n+\t * configurations.\n+\t */\n+\tint64_t minFrameDuration = 33333333;\n+\tif (properties.contains(properties::FrameDurationLimits)) {\n+\t\tSpan durationLimits = properties.get(properties::FrameDurationLimits);\n+\t\tminFrameDuration = static_cast(durationLimits[0]);\n+\t}\n+\n \t/*\n \t * Get the maximum output resolutions\n \t * \\todo Get this from the camera properties once defined\n@@ -316,7 +335,13 @@ int CameraDevice::initializeStreamConfigurations()\n \t\t\t status != CameraConfiguration::Valid)\n \t\t\t\tcontinue;\n \n-\t\t\tstreamConfigurations_.push_back({ res, camera3Format.scalerFormat });\n+\t\t\t/*\n+\t\t\t * Default the minimum frame duration and update it\n+\t\t\t * later.\n+\t\t\t */\n+\t\t\tstreamConfigurations_.push_back({ res,\n+\t\t\t\t\t\t\t camera3Format.scalerFormat,\n+\t\t\t\t\t\t\t minFrameDuration });\n \t\t}\n \t}\n \n@@ -691,7 +716,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tminFrameDurations.push_back(entry.androidScalerCode);\n \t\tminFrameDurations.push_back(entry.resolution.width);\n \t\tminFrameDurations.push_back(entry.resolution.height);\n-\t\tminFrameDurations.push_back(33333333);\n+\t\tminFrameDurations.push_back(entry.minFrameDuration);\n \t}\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n \t\t\t\t minFrameDurations.data(),\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex ed11410a5577..b689d67263b0 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -66,9 +66,10 @@ private:\n \tstruct Camera3StreamConfiguration {\n \t\tlibcamera::Size resolution;\n \t\tint androidScalerCode;\n+\t\tint64_t minFrameDuration;\n \t};\n \n-\tint initializeStreamConfigurations();\n+\tint initializeStreamConfigurations(const libcamera::ControlList &properties);\n \tstd::tuple calculateStaticMetadataSize();\n \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n","prefixes":["libcamera-devel","v3","8/8"]}