[libcamera-devel,4/7] android: camera_device: Report AF_MODE_OFF in template
diff mbox series

Message ID 20210203162600.206297-5-jacopo@jmondi.org
State Accepted
Headers show
Series
  • android: Report all the missing metadata tags
Related show

Commit Message

Jacopo Mondi Feb. 3, 2021, 4:25 p.m. UTC 
The CaptureResultTest#testCameraCaptureResultAllKeys CTS test
enforces the presence of the auto focus mode in the preview
request template.

Add the only supported mode AF_MODE_OFF in the generated template.

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

Comments

Niklas Söderlund Feb. 4, 2021, 9:27 a.m. UTC | #1 
Hi Jacopo,

Thanks for your work.

On 2021-02-03 17:25:57 +0100, Jacopo Mondi wrote:
> The CaptureResultTest#testCameraCaptureResultAllKeys CTS test
> enforces the presence of the auto focus mode in the preview
> request template.
> 
> Add the only supported mode AF_MODE_OFF in the generated template.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/android/camera_device.cpp | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 27f6ec109da9..fdda43e9b4af 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1306,7 +1306,7 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	 * \todo Keep this in sync with the actual number of entries.
>  	 * Currently: 20 entries, 35 bytes
>  	 */
> -	CameraMetadata *requestTemplate = new CameraMetadata(20, 35);
> +	CameraMetadata *requestTemplate = new CameraMetadata(21, 36);
>  	if (!requestTemplate->isValid()) {
>  		delete requestTemplate;
>  		return nullptr;
> @@ -1339,6 +1339,9 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,
>  				  &aeAntibandingMode, 1);
>  
> +	uint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;
> +	requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);
> +
>  	uint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;
>  	requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,
>  				  &afTrigger, 1);
> -- 
> 2.30.0
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Niklas Söderlund Feb. 4, 2021, 9:29 a.m. UTC | #2 
Hi Jacopo,

Thanks for your work.

On 2021-02-03 17:25:57 +0100, Jacopo Mondi wrote:
> The CaptureResultTest#testCameraCaptureResultAllKeys CTS test
> enforces the presence of the auto focus mode in the preview
> request template.
> 
> Add the only supported mode AF_MODE_OFF in the generated template.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/android/camera_device.cpp | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 27f6ec109da9..fdda43e9b4af 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1306,7 +1306,7 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	 * \todo Keep this in sync with the actual number of entries.
>  	 * Currently: 20 entries, 35 bytes
>  	 */
> -	CameraMetadata *requestTemplate = new CameraMetadata(20, 35);
> +	CameraMetadata *requestTemplate = new CameraMetadata(21, 36);
>  	if (!requestTemplate->isValid()) {
>  		delete requestTemplate;
>  		return nullptr;
> @@ -1339,6 +1339,9 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,
>  				  &aeAntibandingMode, 1);
>  
> +	uint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;
> +	requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);
> +
>  	uint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;
>  	requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,
>  				  &afTrigger, 1);
> -- 
> 2.30.0
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
Laurent Pinchart Feb. 4, 2021, 10:11 p.m. UTC | #3 
Hi Jacopo,

Thank you for the patch.

On Wed, Feb 03, 2021 at 05:25:57PM +0100, Jacopo Mondi wrote:
> The CaptureResultTest#testCameraCaptureResultAllKeys CTS test
> enforces the presence of the auto focus mode in the preview
> request template.
> 
> Add the only supported mode AF_MODE_OFF in the generated template.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

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

> ---
>  src/android/camera_device.cpp | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 27f6ec109da9..fdda43e9b4af 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -1306,7 +1306,7 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	 * \todo Keep this in sync with the actual number of entries.
>  	 * Currently: 20 entries, 35 bytes
>  	 */
> -	CameraMetadata *requestTemplate = new CameraMetadata(20, 35);
> +	CameraMetadata *requestTemplate = new CameraMetadata(21, 36);
>  	if (!requestTemplate->isValid()) {
>  		delete requestTemplate;
>  		return nullptr;
> @@ -1339,6 +1339,9 @@ CameraMetadata *CameraDevice::requestTemplatePreview()
>  	requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,
>  				  &aeAntibandingMode, 1);
>  
> +	uint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;
> +	requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);
> +
>  	uint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;
>  	requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,
>  				  &afTrigger, 1);

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 27f6ec109da9..fdda43e9b4af 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1306,7 +1306,7 @@  CameraMetadata *CameraDevice::requestTemplatePreview()
 	 * \todo Keep this in sync with the actual number of entries.
 	 * Currently: 20 entries, 35 bytes
 	 */
-	CameraMetadata *requestTemplate = new CameraMetadata(20, 35);
+	CameraMetadata *requestTemplate = new CameraMetadata(21, 36);
 	if (!requestTemplate->isValid()) {
 		delete requestTemplate;
 		return nullptr;
@@ -1339,6 +1339,9 @@  CameraMetadata *CameraDevice::requestTemplatePreview()
 	requestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,
 				  &aeAntibandingMode, 1);
 
+	uint8_t afMode = ANDROID_CONTROL_AF_MODE_OFF;
+	requestTemplate->addEntry(ANDROID_CONTROL_AF_MODE, &afMode, 1);
+
 	uint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;
 	requestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,
 				  &afTrigger, 1);