NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: camera_device: Only construct required planes

Browse source 
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>
This commit is contained in:
Kieran Bingham 2020-07-06 16:12:03 +01:00
parent 8ad1b9ca22
commit f4c65be7b3
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/android/camera_device.cpp
View file

@ -1118,9 +1118,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer) FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)
{ {
std::vector<FrameBuffer::Plane> planes; 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; FrameBuffer::Plane plane;
plane.fd = FileDescriptor(camera3buffer->data[i]); 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 * 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 * to map the memory of the plane. Libcamera do not need to poke