[libcamera-devel,3/7] android: camera_device: Use AF_MODE_OFF in scene override
diff mbox series

Message ID 20210203162600.206297-4-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 camera HAL does currently list AF_MODE_OFF as the only supported
auto-focus mode in the ANDROID_CONTROL_AF_AVAILABLE_MODES static
metadata. For this reason reporting AF_MODE_AUTO as scene override
is wrong.

At the moment scene override is disabled in the Camera HAL, but this
is worth a fix nonetheless.

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

Comments

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

Thanks for your patch.

On 2021-02-03 17:25:56 +0100, Jacopo Mondi wrote:
> The camera HAL does currently list AF_MODE_OFF as the only supported
> auto-focus mode in the ANDROID_CONTROL_AF_AVAILABLE_MODES static
> metadata. For this reason reporting AF_MODE_AUTO as scene override
> is wrong.
> 
> At the moment scene override is disabled in the Camera HAL, but this
> is worth a fix nonetheless.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

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

> ---
>  src/android/camera_device.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index cdc75b949206..27f6ec109da9 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -852,7 +852,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
>  	std::vector<uint8_t> sceneModesOverride = {
>  		ANDROID_CONTROL_AE_MODE_ON,
>  		ANDROID_CONTROL_AWB_MODE_AUTO,
> -		ANDROID_CONTROL_AF_MODE_AUTO,
> +		ANDROID_CONTROL_AF_MODE_OFF,
>  	};
>  	staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES,
>  				  sceneModesOverride.data(),
> -- 
> 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 | #2
Hi Jacopo,

Thank you for the patch.

On Wed, Feb 03, 2021 at 05:25:56PM +0100, Jacopo Mondi wrote:
> The camera HAL does currently list AF_MODE_OFF as the only supported
> auto-focus mode in the ANDROID_CONTROL_AF_AVAILABLE_MODES static
> metadata. For this reason reporting AF_MODE_AUTO as scene override
> is wrong.
> 
> At the moment scene override is disabled in the Camera HAL, but this
> is worth a fix nonetheless.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

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

> ---
>  src/android/camera_device.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index cdc75b949206..27f6ec109da9 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -852,7 +852,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
>  	std::vector<uint8_t> sceneModesOverride = {
>  		ANDROID_CONTROL_AE_MODE_ON,
>  		ANDROID_CONTROL_AWB_MODE_AUTO,
> -		ANDROID_CONTROL_AF_MODE_AUTO,
> +		ANDROID_CONTROL_AF_MODE_OFF,
>  	};
>  	staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES,
>  				  sceneModesOverride.data(),

Patch
diff mbox series

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index cdc75b949206..27f6ec109da9 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -852,7 +852,7 @@  const camera_metadata_t *CameraDevice::getStaticMetadata()
 	std::vector<uint8_t> sceneModesOverride = {
 		ANDROID_CONTROL_AE_MODE_ON,
 		ANDROID_CONTROL_AWB_MODE_AUTO,
-		ANDROID_CONTROL_AF_MODE_AUTO,
+		ANDROID_CONTROL_AF_MODE_OFF,
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES,
 				  sceneModesOverride.data(),