summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-07-06 16:12:03 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2020-08-06 15:44:02 +0100
commitf4c65be7b3db0c70e5194614817e7e76b8901c88 (patch)
tree075b8a07ade83c9f313e11b681800a82055e6e26
parent8ad1b9ca2231dc28846bd9e7f05fccfe24a383d3 (diff)
android: camera_device: Only construct required planes
The camera3buffer describes the number of filedescriptors given. Don't try to construct more planes than that. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/android/camera_device.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 0a0bcedb..e609ed76 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1118,9 +1118,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)
{
std::vector<FrameBuffer::Plane> planes;
- for (unsigned int i = 0; i < 3; i++) {
+ for (int i = 0; i < camera3buffer->numFds; i++) {
+ /* Skip unused planes. */
+ if (camera3buffer->data[i] == -1)
+ break;
+
FrameBuffer::Plane plane;
plane.fd = FileDescriptor(camera3buffer->data[i]);
+ if (!plane.fd.isValid()) {
+ LOG(HAL, Error) << "Failed to obtain FileDescriptor ("
+ << camera3buffer->data[i] << ") "
+ << " on plane " << i;
+ return nullptr;
+ }
+
/*
* Setting length to zero here is OK as the length is only used
* to map the memory of the plane. Libcamera do not need to poke