summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-03-08 17:03:14 +0100
committerJacopo Mondi <jacopo@jmondi.org>2021-03-09 08:59:25 +0100
commitf179616ec7dab5ab0276657386e7c61d024d2169 (patch)
tree510fcebefc354696e1a1909da03b3a930f168729 /src
parent2c34991d16caf54a7bc32eb607a712b8b973c1eb (diff)
android: camera_device: Fail template on no FPS range
The camera supported FPS range is crucial to distinguish between capture templates for preview and video recording. If the pipeline handler did not specify an available FPS range by registering the controls::FrameDurations property so far the control was simply not added to the generated capture template. In order to prepare to generate templates for video recording which require a fixed FPS range, fail earlier in generating any template at all if the available FPS range is not provided by the Camera. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
-rw-r--r--src/android/camera_device.cpp36
1 files changed, 20 insertions, 16 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 3c408a68..b8f51973 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1376,6 +1376,26 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
return nullptr;
}
+ /* Get the FPS range registered in the static metadata. */
+ camera_metadata_ro_entry_t entry;
+ bool found = staticMetadata_->getEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,
+ &entry);
+ if (!found) {
+ LOG(HAL, Error) << "Cannot create capture template without FPS range";
+ return nullptr;
+ }
+
+ /*
+ * \todo Depending on the requested CaptureIntent, the FPS range
+ * needs to be adjusted. For example, the capture template for
+ * video capture intent shall report a fixed value.
+ *
+ * Also assume the AE_AVAILABLE_TARGET_FPS_RANGE static metadata
+ * has been assembled as {{min, max} {max, max}}.
+ */
+ requestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,
+ entry.data.i32, 2);
+
uint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;
requestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,
&aeMode, 1);
@@ -1392,22 +1412,6 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
requestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,
&aeLock, 1);
- /* Get the FPS range registered in the static metadata. */
- camera_metadata_ro_entry_t entry;
- bool found = staticMetadata_->getEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,
- &entry);
- if (found)
- /*
- * \todo Depending on the requested CaptureIntent, the FPS range
- * needs to be adjusted. For example, the capture template for
- * video capture intent shall report a fixed value.
- *
- * Also assume the AE_AVAILABLE_TARGET_FPS_RANGE static metadata
- * has been assembled as {{min, max} {max, max}}.
- */
- requestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,
- entry.data.i32, 2);
-
uint8_t aeAntibandingMode = ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO;
requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,
&aeAntibandingMode, 1);