[libcamera-devel,v2,09/12] android: camera_device: Report configuration changes from validate()

Message ID 20200803161816.107113-10-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • android: jpeg
Related show

Commit Message

Kieran Bingham Aug. 3, 2020, 4:18 p.m. UTC
When we call validate on a configuration, if there are any adjustments
on the configuration, we fail without showing why.

Display the stream configuration after the validate stage to aid
debugging stream startup failures.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/android/camera_device.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Jacopo Mondi Aug. 4, 2020, 11:04 a.m. UTC | #1
Hi Kieran,
   I think this is useful debug

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

Thanks
   j

On Mon, Aug 03, 2020 at 05:18:13PM +0100, Kieran Bingham wrote:
> When we call validate on a configuration, if there are any adjustments
> on the configuration, we fail without showing why.
>
> Display the stream configuration after the validate stage to aid
> debugging stream startup failures.
>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> ---
>  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 9f3f3315aed4..ae52a5ca8b86 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -987,7 +987,11 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
>  	case CameraConfiguration::Valid:
>  		break;
>  	case CameraConfiguration::Adjusted:
> -		LOG(HAL, Info) << "Camera configuration adjusted";
> +		LOG(HAL, Info) << "Camera configuration adjusted:";
> +
> +		for (const StreamConfiguration &cfg : *config_)
> +			LOG(HAL, Info) << " : " << cfg.toString();
> +
>  		config_.reset();
>  		return -EINVAL;
>  	case CameraConfiguration::Invalid:
> --
> 2.25.1
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 9f3f3315aed4..ae52a5ca8b86 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -987,7 +987,11 @@  int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 	case CameraConfiguration::Valid:
 		break;
 	case CameraConfiguration::Adjusted:
-		LOG(HAL, Info) << "Camera configuration adjusted";
+		LOG(HAL, Info) << "Camera configuration adjusted:";
+
+		for (const StreamConfiguration &cfg : *config_)
+			LOG(HAL, Info) << " : " << cfg.toString();
+
 		config_.reset();
 		return -EINVAL;
 	case CameraConfiguration::Invalid: