summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-04-03 22:37:40 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-04-04 01:47:09 +0300
commit7633a2d24d86554ef3586a7adad02f81555f4440 (patch)
tree66277452a543ef7d34bb155eeea33fa5a92fa886
parentd13462f3d0f31cd24f11f44c1efe09457c691aba (diff)
android: cameraDevice: Factorize the code of validating camera3_capture_request
CameraDevice::processCaptureRequest() checks the validity 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@chromium.org> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/android/camera_device.cpp24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 0e942390..b45e7884 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 */
/*
@@ -1790,15 +1805,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_) {