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

libcamera: v4l2_videodevice: Improve toColorSpace() readability

Browse source 
Wrap V4L2Device::toColorspace() inside a private static member
function in V4L2VideoDevice class. It improves readability in
setting the colorspace for V4L2DeviceFormat.

No functional changes intended.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Umang Jain 2022-08-30 13:17:21 +05:30
parent e297673e76
commit e52729e7ec
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/libcamera/internal/v4l2_videodevice.h
View file

@ -268,6 +268,9 @@ private:
void watchdogExpired(); void watchdogExpired();
template<typename T>
static std::optional<ColorSpace> toColorSpace(const T &v4l2Format);
V4L2Capability caps_; V4L2Capability caps_;
V4L2DeviceFormat format_; V4L2DeviceFormat format_;
const PixelFormatInfo *formatInfo_; const PixelFormatInfo *formatInfo_;

19
src/libcamera/v4l2_videodevice.cpp
View file

@ -914,6 +914,13 @@ int V4L2VideoDevice::trySetFormatMeta(V4L2DeviceFormat *format, bool set)
return 0; return 0;
} }
template<typename T>
std::optional<ColorSpace> V4L2VideoDevice::toColorSpace(const T &v4l2Format)
{
V4L2PixelFormat fourcc{ v4l2Format.pixelformat };
return V4L2Device::toColorSpace(v4l2Format, PixelFormatInfo::info(fourcc).colourEncoding);
}
int V4L2VideoDevice::getFormatMultiplane(V4L2DeviceFormat *format) int V4L2VideoDevice::getFormatMultiplane(V4L2DeviceFormat *format)
{ {
struct v4l2_format v4l2Format = {}; struct v4l2_format v4l2Format = {};
@ -931,8 +938,7 @@ int V4L2VideoDevice::getFormatMultiplane(V4L2DeviceFormat *format)
format->size.height = pix->height; format->size.height = pix->height;
format->fourcc = V4L2PixelFormat(pix->pixelformat); format->fourcc = V4L2PixelFormat(pix->pixelformat);
format->planesCount = pix->num_planes; format->planesCount = pix->num_planes;
format->colorSpace = format->colorSpace = toColorSpace(*pix);
toColorSpace(*pix, PixelFormatInfo::info(format->fourcc).colourEncoding);
for (unsigned int i = 0; i < format->planesCount; ++i) { for (unsigned int i = 0; i < format->planesCount; ++i) {
format->planes[i].bpl = pix->plane_fmt[i].bytesperline; format->planes[i].bpl = pix->plane_fmt[i].bytesperline;
@ -988,8 +994,7 @@ int V4L2VideoDevice::trySetFormatMultiplane(V4L2DeviceFormat *format, bool set)
format->planes[i].bpl = pix->plane_fmt[i].bytesperline; format->planes[i].bpl = pix->plane_fmt[i].bytesperline;
format->planes[i].size = pix->plane_fmt[i].sizeimage; format->planes[i].size = pix->plane_fmt[i].sizeimage;
} }
format->colorSpace = format->colorSpace = toColorSpace(*pix);
toColorSpace(*pix, PixelFormatInfo::info(format->fourcc).colourEncoding);
return 0; return 0;
} }
@ -1013,8 +1018,7 @@ int V4L2VideoDevice::getFormatSingleplane(V4L2DeviceFormat *format)
format->planesCount = 1; format->planesCount = 1;
format->planes[0].bpl = pix->bytesperline; format->planes[0].bpl = pix->bytesperline;
format->planes[0].size = pix->sizeimage; format->planes[0].size = pix->sizeimage;
format->colorSpace = format->colorSpace = toColorSpace(*pix);
toColorSpace(*pix, PixelFormatInfo::info(format->fourcc).colourEncoding);
return 0; return 0;
} }
@ -1056,8 +1060,7 @@ int V4L2VideoDevice::trySetFormatSingleplane(V4L2DeviceFormat *format, bool set)
format->planesCount = 1; format->planesCount = 1;
format->planes[0].bpl = pix->bytesperline; format->planes[0].bpl = pix->bytesperline;
format->planes[0].size = pix->sizeimage; format->planes[0].size = pix->sizeimage;
format->colorSpace = format->colorSpace = toColorSpace(*pix);
toColorSpace(*pix, PixelFormatInfo::info(format->fourcc).colourEncoding);
return 0; return 0;
} }