[libcamera-devel,v4,2/4] android: CameraDevice: Validate crop_rotate_scale_degrees in configuration
diff mbox series

Message ID 20210403131015.1590399-2-hiroh@chromium.org
State Accepted
Headers show
Series
  • Untitled series #1885
Related show

Commit Message

Hirokazu Honda April 3, 2021, 1:10 p.m. UTC 
libcamera doesn't handle |crop_rotate_scale_degrees| in
camera3_stream at all. This adds the validation of the requested
|crop_rotate_scale_degrees| in configuration, but still not
handle the specified values.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_device.cpp | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index eb327978..3f7cce8e 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -256,6 +256,44 @@  void sortCamera3StreamConfigs(std::vector<Camera3StreamConfig> &unsortedConfigs,
 	unsortedConfigs = sortedConfigs;
 }
 
+#if defined(OS_CHROMEOS)
+/*
+ * Check whether the crop_rotate_scale_degrees values for all streams in
+ * the list are valid according to the Chrome OS camera HAL API.
+ */
+bool validateCropRotate(const camera3_stream_configuration_t &streamList)
+{
+	ASSERT(streamList.num_streams > 0);
+	const int cropRotateScaleDegrees =
+		streamList.streams[0]->crop_rotate_scale_degrees;
+	for (unsigned int i = 0; i < streamList.num_streams; ++i) {
+		const camera3_stream_t &stream = *streamList.streams[i];
+
+		switch (stream.crop_rotate_scale_degrees) {
+		case CAMERA3_STREAM_ROTATION_0:
+		case CAMERA3_STREAM_ROTATION_90:
+		case CAMERA3_STREAM_ROTATION_270:
+			break;
+
+		/* 180° rotation is specified by Chrome OS as invalid. */
+		case CAMERA3_STREAM_ROTATION_180:
+		default:
+			LOG(HAL, Error) << "Invalid crop_rotate_scale_degrees: "
+					<< stream.crop_rotate_scale_degrees;
+			return false;
+		}
+
+		if (cropRotateScaleDegrees != stream.crop_rotate_scale_degrees) {
+			LOG(HAL, Error) << "crop_rotate_scale_degrees in all "
+					<< "streams are not identical";
+			return false;
+		}
+	}
+
+	return true;
+}
+#endif
+
 } /* namespace */
 
 /*
@@ -1554,6 +1592,11 @@  int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 		running_ = false;
 	}
 
+#if defined(OS_CHROMEOS)
+	if (!validateCropRotate(*stream_list))
+		return -EINVAL;
+#endif
+
 	/*
 	 * Generate an empty configuration, and construct a StreamConfiguration
 	 * for each camera3_stream to add to it.