Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 10:25:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: v4l2_camera_proxy: Support MJPEG

Browse source 
Add an entry for MJPEG in V4L2CameraProxy's PixelFormatInfo list to
allow proper calculation of sizeimage for MJPEG, such that the
parameters to mmap can align properly instead of failing. This allows
MJPEG to be used in the V4L2 compatibility layer.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder 2020-06-06 15:53:09 +09:00
parent 5801dedd2a
commit 6781f8b463
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -358,8 +358,9 @@ int V4L2CameraProxy::vidioc_reqbufs(struct v4l2_requestbuffers *arg)
* don't support streaming mmap. Since we don't support readwrite and * don't support streaming mmap. Since we don't support readwrite and
* userptr either, the application will get confused and think that * userptr either, the application will get confused and think that
* we don't support anything. * we don't support anything.
* On the other hand, if a format has a zero sizeimage (eg. MJPEG), * On the other hand, if the set format at the time of reqbufs has a
* we'll get a floating point exception when we try to stream it. * zero sizeimage we'll get a floating point exception when we try to
* stream it.
*/ */
if (sizeimage_ == 0) if (sizeimage_ == 0)
LOG(V4L2Compat, Warning) LOG(V4L2Compat, Warning)
@ -556,7 +557,7 @@ struct PixelFormatInfo {
namespace { namespace {
static const std::array<PixelFormatInfo, 13> pixelFormatInfo = {{ static const std::array<PixelFormatInfo, 14> pixelFormatInfo = {{
/* RGB formats. */ /* RGB formats. */
{ PixelFormat(DRM_FORMAT_RGB888), V4L2_PIX_FMT_BGR24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_RGB888), V4L2_PIX_FMT_BGR24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
{ PixelFormat(DRM_FORMAT_BGR888), V4L2_PIX_FMT_RGB24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_BGR888), V4L2_PIX_FMT_RGB24, 1, {{ { 24, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
@ -573,6 +574,13 @@ static const std::array<PixelFormatInfo, 13> pixelFormatInfo = {{
{ PixelFormat(DRM_FORMAT_NV61), V4L2_PIX_FMT_NV61, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV61), V4L2_PIX_FMT_NV61, 2, {{ { 8, 1, 1 }, { 16, 2, 1 }, { 0, 0, 0 } }} },
{ PixelFormat(DRM_FORMAT_NV24), V4L2_PIX_FMT_NV24, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV24), V4L2_PIX_FMT_NV24, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} },
{ PixelFormat(DRM_FORMAT_NV42), V4L2_PIX_FMT_NV42, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} }, { PixelFormat(DRM_FORMAT_NV42), V4L2_PIX_FMT_NV42, 2, {{ { 8, 1, 1 }, { 16, 1, 1 }, { 0, 0, 0 } }} },
/* Compressed formats. */
/*
* \todo Get a better image size estimate for MJPEG, via
* StreamConfiguration, instead of using the worst-case
* width * height * bpp of uncompressed data.
*/
{ PixelFormat(DRM_FORMAT_MJPEG), V4L2_PIX_FMT_MJPEG, 1, {{ { 16, 1, 1 }, { 0, 0, 0 }, { 0, 0, 0 } }} },
}}; }};
} /* namespace */ } /* namespace */