summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-07-01 13:40:17 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2020-07-07 11:50:51 +0100
commit61f4296ac749f39896f151221ea0e20876842803 (patch)
treeb983d50cebc935c91f2b7d57f9f567d462b67daa /src/android
parent0cfdf737dcf8bbdd400d107c0143a2d79ea76ec4 (diff)
android: camera_device: Remove single buffer restriction.
A capture request is no longer limited to a single output buffer. Remove the limitation, but (for now) keep the check to ensure that at least one buffer is always provided. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 3f18fdfa..48f8090a 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1050,9 +1050,8 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer
int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)
{
- if (camera3Request->num_output_buffers != 1) {
- LOG(HAL, Error) << "Invalid number of output buffers: "
- << camera3Request->num_output_buffers;
+ if (!camera3Request->num_output_buffers) {
+ LOG(HAL, Error) << "No output buffers provided";
return -EINVAL;
}