[libcamera-devel] [PATCH 2/3] android: camera_device: Add missing request keys
Niklas Söderlund
niklas.soderlund at ragnatech.se
Sat Jan 30 00:15:23 CET 2021
Hello Jacopo,
Thanks for your patch.
On 2021-01-29 15:26:14 +0100, Jacopo Mondi wrote:
> The Camera HAL does not report all the Request keys which are
> mandatory for the advertised BACKWARD_COMPATIBLE capabilities
> level. Add them.
>
> This fixes the CTS test:
> android.hardware.camera2.cts.StaticMetadataTest#testCapabilities
>
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
I trust your byteSize calculation,
Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
> src/android/camera_device.cpp | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 83e2734541e3..b66e7c71884a 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -705,10 +705,10 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
> {
> /*
> * \todo Keep this in sync with the actual number of entries.
> - * Currently: 53 entries, 782 bytes of static metadata
> + * Currently: 53 entries, 846 bytes of static metadata
> */
> uint32_t numEntries = 53;
> - uint32_t byteSize = 810;
> + uint32_t byteSize = 846;
>
> /*
> * Calculate space occupation in bytes for dynamically built metadata
> @@ -1218,15 +1218,24 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
> ANDROID_CONTROL_AE_MODE,
> ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,
> ANDROID_CONTROL_AE_TARGET_FPS_RANGE,
> + ANDROID_CONTROL_AF_MODE,
> ANDROID_CONTROL_AF_TRIGGER,
> ANDROID_CONTROL_AWB_LOCK,
> ANDROID_CONTROL_AWB_MODE,
> ANDROID_CONTROL_CAPTURE_INTENT,
> + ANDROID_CONTROL_EFFECT_MODE,
> ANDROID_CONTROL_MODE,
> + ANDROID_CONTROL_SCENE_MODE,
> + ANDROID_CONTROL_VIDEO_STABILIZATION_MODE,
> ANDROID_FLASH_MODE,
> + ANDROID_JPEG_ORIENTATION,
> + ANDROID_JPEG_QUALITY,
> + ANDROID_JPEG_THUMBNAIL_QUALITY,
> + ANDROID_JPEG_THUMBNAIL_SIZE,
> ANDROID_LENS_APERTURE,
> ANDROID_LENS_OPTICAL_STABILIZATION_MODE,
> ANDROID_NOISE_REDUCTION_MODE,
> + ANDROID_SCALER_CROP_REGION,
> ANDROID_STATISTICS_FACE_DETECT_MODE
> };
> staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,
> --
> 2.30.0
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
--
Regards,
Niklas Söderlund
More information about the libcamera-devel
mailing list