PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: framebuffer: Allocate metadata planes at construction time

Browse Source 
The metadata planes are allocated by V4L2VideoDevice when dequeuing a
buffer. This causes the metadata planes to only be allocated after a
buffer gets dequeued, and doesn't provide any strong guarantee that
their number matches the number of FrameBuffer planes. The lack of this
invariant makes the FrameBuffer class fragile.

As a first step towards fixing this, allocate the metadata planes when
the FrameBuffer is constructed. The FrameMetadata API should be further
improved by preventing a change in the number of planes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Laurent Pinchart
2021-09-02 04:29:03 +03:00
parent 0f4d81c2bf
commit 9df775c757
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/framebuffer.cpp
+2
View File
@@ -210,6 +210,8 @@ FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)
: Extensible(std::make_unique<Private>()), planes_(planes),
cookie_(cookie)
{
metadata_.planes.resize(planes_.size());
unsigned int offset = 0;
bool isContiguous = true;
ino_t inode = 0;
src/libcamera/v4l2_videodevice.cpp
+5 -5
View File
@@ -1675,7 +1675,6 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer()
unsigned int numV4l2Planes = multiPlanar ? buf.length : 1;
FrameMetadata &metadata = buffer->metadata_;
metadata.planes.clear();
if (numV4l2Planes != buffer->planes().size()) {
/*
@@ -1705,8 +1704,9 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer()
return buffer;
}
metadata.planes.push_back({ std::min(plane.length, bytesused) });
bytesused -= metadata.planes.back().bytesused;
metadata.planes[i].bytesused =
std::min(plane.length, bytesused);
bytesused -= metadata.planes[i].bytesused;
}
} else if (multiPlanar) {
/*
@@ -1715,9 +1715,9 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer()
* V4L2 buffer is guaranteed to be equal at this point.
*/
for (unsigned int i = 0; i < numV4l2Planes; ++i)
metadata.planes.push_back({ planes[i].bytesused });
metadata.planes[i].bytesused = planes[i].bytesused;
} else {
metadata.planes.push_back({ buf.bytesused });
metadata.planes[0].bytesused = buf.bytesused;
}
return buffer;