[libcamera-devel,v3,2/2] android: camera_device: Set the camera location to Front if External
diff mbox series

Message ID 20210224094833.24219-3-paul.elder@ideasonboard.com
State Accepted
Commit 3d39df27a79385c6a8006a2ae29555e36720b8fd
Headers show
Series
  • Fix camera location
Related show

Commit Message

Paul Elder Feb. 24, 2021, 9:48 a.m. UTC
Our android HAL implementation currently does not support external
cameras, so if the camera location property is external, set it to
front.

This allows the following CTS test to pass:
- android.hardware.camera2.cts.CameraManagerTest#testCameraManagerGetDeviceIdList

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

---
No change in v2
---
 src/android/camera_device.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Jacopo Mondi Feb. 24, 2021, 9:58 a.m. UTC | #1
Hi Paul,

On Wed, Feb 24, 2021 at 06:48:32PM +0900, Paul Elder wrote:
> Our android HAL implementation currently does not support external
> cameras, so if the camera location property is external, set it to
> front.
>
> This allows the following CTS test to pass:
> - android.hardware.camera2.cts.CameraManagerTest#testCameraManagerGetDeviceIdList
>
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> ---
> No change in v2
> ---
>  src/android/camera_device.cpp | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index 1e2a5b5f..16cb8c6d 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -405,7 +405,11 @@ int CameraDevice::initialize()
>  			facing_ = CAMERA_FACING_BACK;
>  			break;
>  		case properties::CameraLocationExternal:
> -			facing_ = CAMERA_FACING_EXTERNAL;
> +			/*
> +			 * \todo Set this to EXTERNAL once we support
> +			 * HARDWARE_LEVEL_EXTERNAL
> +			 */
> +			facing_ = CAMERA_FACING_FRONT;

I keep thinking that we're calling for troubles once we'll have to
really determinate if a camera is external for real. But since there
has been a too long discussion already:

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j
>  			break;
>  		}
>  	}
> --
> 2.27.0
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 1e2a5b5f..16cb8c6d 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -405,7 +405,11 @@  int CameraDevice::initialize()
 			facing_ = CAMERA_FACING_BACK;
 			break;
 		case properties::CameraLocationExternal:
-			facing_ = CAMERA_FACING_EXTERNAL;
+			/*
+			 * \todo Set this to EXTERNAL once we support
+			 * HARDWARE_LEVEL_EXTERNAL
+			 */
+			facing_ = CAMERA_FACING_FRONT;
 			break;
 		}
 	}