[libcamera-devel,v5,4/8] android: camera_device: Add missing tags in request template

Message ID 20190904141825.20697-5-jacopo@jmondi.org
State Superseded
Headers show
Series
  • android: Rework metadata tags
Related show

Commit Message

Jacopo Mondi Sept. 4, 2019, 2:18 p.m. UTC
Add two missing tags from the request template generated by the HAL.
The tags are reported as missing by the cros_camera_test tool.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_device.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Laurent Pinchart Sept. 4, 2019, 2:26 p.m. UTC | #1
Hi Jacopo,

Thank you for the patch.

On Wed, Sep 04, 2019 at 04:18:21PM +0200, Jacopo Mondi wrote:
> Add two missing tags from the request template generated by the HAL.
> The tags are reported as missing by the cros_camera_test tool.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

My

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

still applies :-)

> ---
>  src/android/camera_device.cpp | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index bd69198ec482..969c8192c316 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -611,6 +611,17 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)
>  			&faceDetectMode, 1);
>  	METADATA_ASSERT(ret);
>  
> +	uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;
> +	ret = add_camera_metadata_entry(requestTemplate_,
> +			ANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1);
> +	METADATA_ASSERT(ret);
> +
> +	uint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;
> +	ret = add_camera_metadata_entry(requestTemplate_,
> +			ANDROID_COLOR_CORRECTION_ABERRATION_MODE,
> +			&aberrationMode, 1);
> +	METADATA_ASSERT(ret);
> +
>  	ret = add_camera_metadata_entry(requestTemplate_,
>  			ANDROID_CONTROL_CAPTURE_INTENT,
>  			&captureIntent, 1);

Patch

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index bd69198ec482..969c8192c316 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -611,6 +611,17 @@  const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)
 			&faceDetectMode, 1);
 	METADATA_ASSERT(ret);
 
+	uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;
+	ret = add_camera_metadata_entry(requestTemplate_,
+			ANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1);
+	METADATA_ASSERT(ret);
+
+	uint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;
+	ret = add_camera_metadata_entry(requestTemplate_,
+			ANDROID_COLOR_CORRECTION_ABERRATION_MODE,
+			&aberrationMode, 1);
+	METADATA_ASSERT(ret);
+
 	ret = add_camera_metadata_entry(requestTemplate_,
 			ANDROID_CONTROL_CAPTURE_INTENT,
 			&captureIntent, 1);