[libcamera-devel,v2,2/3] android: CameraDevice: Log rotation variables in camera3_stream
diff mbox series

Message ID 20210328224528.55468-3-hiroh@chromium.org
State Superseded
Headers show
Series
  • Regard crop_rotate_scale_degrees in configuration
Related show

Commit Message

Hirokazu Honda March 28, 2021, 10:45 p.m. UTC 
|rotation| and |crop_rotate_scale_degrees| are important info of
a configuration. They should be logged.

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

--
2.31.0.291.g576ba9dcdaf-goog

Comments

Laurent Pinchart March 29, 2021, 4:31 a.m. UTC | #1 
Hi Hiro,

Thank you for the patch.

On Mon, Mar 29, 2021 at 07:45:27AM +0900, Hirokazu Honda wrote:
> |rotation| and |crop_rotate_scale_degrees| are important info of
> a configuration. They should be logged.
> 
> Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/android/camera_device.cpp | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index c5e55a18..d3368b19 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -256,6 +256,20 @@ void sortCamera3StreamConfigs(std::vector<Camera3StreamConfig> &unsortedConfigs,
>  	unsortedConfigs = sortedConfigs;
>  }
> 
> +const char *rotationToString(int rotation)
> +{
> +	switch (rotation) {
> +	case CAMERA3_STREAM_ROTATION_0:
> +		return "ROTATION_0";
> +	case CAMERA3_STREAM_ROTATION_90:
> +		return "ROTATION_90";
> +	case CAMERA3_STREAM_ROTATION_180:
> +		return "ROTATION_180";
> +	case CAMERA3_STREAM_ROTATION_270:
> +		return "ROTATION_270";
> +	}
> +	return "ROTATION_INVALID";

How about dropping the ROTATION_ prefix in all of these ? The lines
printed to describe each stream are long enough already.

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

> +}
>  /*
>   * Returns where crop_rotate_scale_degrees in all camera3_stream in stream_list
>   * are valid.
> @@ -1625,6 +1639,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
>  			       << ", width: " << stream->width
>  			       << ", height: " << stream->height
>  			       << ", format: " << utils::hex(stream->format)
> +			       << ", rotation: " << rotationToString(stream->rotation)
> +			       << ", crop_rotate_scale_degrees: "
> +			       << rotationToString(stream->crop_rotate_scale_degrees)
>  			       << " (" << format.toString() << ")";
> 
>  		if (!format.isValid())

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index c5e55a18..d3368b19 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -256,6 +256,20 @@  void sortCamera3StreamConfigs(std::vector<Camera3StreamConfig> &unsortedConfigs,
 	unsortedConfigs = sortedConfigs;
 }

+const char *rotationToString(int rotation)
+{
+	switch (rotation) {
+	case CAMERA3_STREAM_ROTATION_0:
+		return "ROTATION_0";
+	case CAMERA3_STREAM_ROTATION_90:
+		return "ROTATION_90";
+	case CAMERA3_STREAM_ROTATION_180:
+		return "ROTATION_180";
+	case CAMERA3_STREAM_ROTATION_270:
+		return "ROTATION_270";
+	}
+	return "ROTATION_INVALID";
+}
 /*
  * Returns where crop_rotate_scale_degrees in all camera3_stream in stream_list
  * are valid.
@@ -1625,6 +1639,9 @@  int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 			       << ", width: " << stream->width
 			       << ", height: " << stream->height
 			       << ", format: " << utils::hex(stream->format)
+			       << ", rotation: " << rotationToString(stream->rotation)
+			       << ", crop_rotate_scale_degrees: "
+			       << rotationToString(stream->crop_rotate_scale_degrees)
 			       << " (" << format.toString() << ")";

 		if (!format.isValid())