[libcamera-devel] [PATCH v2 1/2] android: cameraDevice: Factorize the code of validating camera3_capture_request

[Hirokazu Honda]

CameraDevice::processCaptureRequest() checks the validness of a
provided camera3_capture_request. This factorizes the code in
order to add more validation to the request later.

Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
---
 src/android/camera_device.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index eb327978..988c1fd5 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -256,6 +256,21 @@ void sortCamera3StreamConfigs(std::vector<Camera3StreamConfig> &unsortedConfigs,
 	unsortedConfigs = sortedConfigs;
 }
 
+bool isValidRequest(camera3_capture_request_t *camera3Request)
+{
+	if (!camera3Request) {
+		LOG(HAL, Error) << "No capture request provided";
+		return false;
+	}
+
+	if (!camera3Request->num_output_buffers) {
+		LOG(HAL, Error) << "No output buffers provided";
+		return false;
+	}
+
+	return true;
+}
+
 } /* namespace */
 
 /*
@@ -1785,15 +1800,8 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)
 
 int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)
 {
-	if (!camera3Request) {
-		LOG(HAL, Error) << "No capture request provided";
+	if (isValidRequest(camera3Request))
 		return -EINVAL;
-	}
-
-	if (!camera3Request->num_output_buffers) {
-		LOG(HAL, Error) << "No output buffers provided";
-		return -EINVAL;
-	}
 
 	/* Start the camera if that's the first request we handle. */
 	if (!running_) {
-- 
2.31.0.208.g409f899ff0-goog