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

libcamera: rpi: Add some helpers to PipelineHandlerBase

Browse source 
Add a helper updateStreamConfig() that updates the format related fields
in a StreamConfiguration from a given V4L2DeviceFormat structure.

Add and override to the toV4L2DeviceFormat() helper that returns a
V4L2DeviceFormat structure populated from the format related fields in
a StreamConfiguration.

Both these helper functions will be used in a future commit to simplify
the Raspberry Pi pipeline handler configuration/validation code.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2023-09-21 18:55:46 +02:00 • committed by Laurent Pinchart
parent 0602cbc596
commit 71bbf10a2f
2 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/libcamera/pipeline/rpi/common/pipeline_base.cpp
View file

@ -353,6 +353,53 @@ bool PipelineHandlerBase::isRaw(const PixelFormat &pixFmt)
return BayerFormat::fromPixelFormat(pixFmt).isValid();
}
/*
* Adjust a StreamConfiguration fields to match a video device format.
* Returns true if the StreamConfiguration has been adjusted.
*/
bool PipelineHandlerBase::updateStreamConfig(StreamConfiguration *stream,
const V4L2DeviceFormat &format)
{
const PixelFormat &pixFormat = format.fourcc.toPixelFormat();
bool adjusted = false;
if (stream->pixelFormat != pixFormat || stream->size != format.size) {
stream->pixelFormat = pixFormat;
stream->size = format.size;
adjusted = true;
}
if (stream->colorSpace != format.colorSpace) {
stream->colorSpace = format.colorSpace;
adjusted = true;
LOG(RPI, Debug)
<< "Color space changed from "
<< ColorSpace::toString(stream->colorSpace) << " to "
<< ColorSpace::toString(format.colorSpace);
}
stream->stride = format.planes[0].bpl;
stream->frameSize = format.planes[0].size;
return adjusted;
}
/*
* Populate and return a video device format using a StreamConfiguration. */
V4L2DeviceFormat PipelineHandlerBase::toV4L2DeviceFormat(const V4L2VideoDevice *dev,
const StreamConfiguration *stream)
{
V4L2DeviceFormat deviceFormat;
const PixelFormatInfo &info = PixelFormatInfo::info(stream->pixelFormat);
deviceFormat.planesCount = info.numPlanes();
deviceFormat.fourcc = dev->toV4L2PixelFormat(stream->pixelFormat);
deviceFormat.size = stream->size;
deviceFormat.colorSpace = stream->colorSpace;
return deviceFormat;
}
V4L2DeviceFormat PipelineHandlerBase::toV4L2DeviceFormat(const V4L2VideoDevice *dev,
const V4L2SubdeviceFormat &format,
BayerFormat::Packing packingReq)

4
src/libcamera/pipeline/rpi/common/pipeline_base.h
View file

@ -198,6 +198,10 @@ public:
static bool isYuv(const PixelFormat &pixFmt);
static bool isRaw(const PixelFormat &pixFmt);
static bool updateStreamConfig(StreamConfiguration *stream,
const V4L2DeviceFormat &format);
static V4L2DeviceFormat toV4L2DeviceFormat(const V4L2VideoDevice *dev,
const StreamConfiguration *stream);
static V4L2DeviceFormat toV4L2DeviceFormat(const V4L2VideoDevice *dev,
const V4L2SubdeviceFormat &format,
BayerFormat::Packing packingReq);