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

v4l2: Sum bytesused for all planes when dequeuing buffer

Browse source 
The V4L2 compatibility layer supports the single-planar API only, and
thus exposes a single V4L2 buffer plane to applications, regardless of
the number of planes in the FrameBuffer. For multi-planar frame buffers,
the bytesused value isn't correct as it only takes the first plane into
account. Fix it by summing the bytesused values for all FrameBuffer
planes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-09-07 00:06:52 +03:00
parent a339d055cc
commit a25710428e
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -11,6 +11,7 @@
#include <array> #include <array>
#include <errno.h> #include <errno.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <numeric>
#include <set> #include <set>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
@ -211,7 +212,11 @@ void V4L2CameraProxy::updateBuffers()
switch (fmd.status) { switch (fmd.status) {
case FrameMetadata::FrameSuccess: case FrameMetadata::FrameSuccess:
buf.bytesused = fmd.planes()[0].bytesused; buf.bytesused = std::accumulate(fmd.planes().begin(),
fmd.planes().end(), 0,
[](unsigned int total, const auto &plane) {
return total + plane.bytesused;
});
buf.field = V4L2_FIELD_NONE; buf.field = V4L2_FIELD_NONE;
buf.timestamp.tv_sec = fmd.timestamp / 1000000000; buf.timestamp.tv_sec = fmd.timestamp / 1000000000;
buf.timestamp.tv_usec = fmd.timestamp % 1000000; buf.timestamp.tv_usec = fmd.timestamp % 1000000;