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

libcamera: v4l2_videodevice: Drop toV4L2PixelFormat()

Browse Source 
The V4L2VideoDevice::toV4L2PixelFormat() function is incorrectly
implemented, as it will pick a multi-planar format if the device
supports the multi-planar API, even if only single-planar formats are
supported. This currently works because the implementation calls
V4L2PixelFormat::fromPixelFormat(), which ignores the multiplanar
argument and always returns a single-planar format.

Fixing this isn't trivial. As we don't need to support multi-planar V4L2
formats at this point, drop the function instead of pretending
everything is fine, and call V4L2PixelFormat::fromPixelFormat() directly
from pipeline handlers. As the single-planar case is the most common,
set the multiplanar argument to false by default to avoid long lines.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
This commit is contained in:
Laurent Pinchart
2021-09-04 01:13:58 +03:00
parent 8e18f8d45f
commit 395d43d6d7
12 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/v4l2_videodevice.cpp
-17
View File
@@ -1687,23 +1687,6 @@ V4L2VideoDevice::fromEntityName(const MediaDevice *media,
return std::make_unique<V4L2VideoDevice>(mediaEntity);
}
/**
* \brief Convert \a PixelFormat to its corresponding V4L2 FourCC
* \param[in] pixelFormat The PixelFormat to convert
*
* For multiplanar formats, the V4L2 format variant (contiguous or
* non-contiguous planes) is selected automatically based on the capabilities
* of the video device. If the video device supports the V4L2 multiplanar API,
* non-contiguous formats are preferred.
*
* \return The V4L2_PIX_FMT_* pixel format code corresponding to \a pixelFormat
*/
V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat)
{
return V4L2PixelFormat::fromPixelFormat(pixelFormat,
caps_.isMultiplanar());
}
/**
* \class V4L2M2MDevice
* \brief Memory-to-Memory video device