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

v4l2: Use V4L2PixelFormat::toPixelFormat()

Browse source 
Replace the open-coded PixelFormat lookup with the
V4L2PixelFormat::toPixelFormat() helper function. This simplifies the
implementation.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasoboard.com>
This commit is contained in:
Laurent Pinchart 2021-09-03 22:03:01 +03:00
parent 3335d5a504
commit e6886f6352
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -243,7 +243,7 @@ int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_fr
LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << file->efd(); LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << file->efd();
V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->pixel_format); V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->pixel_format);
PixelFormat format = PixelFormatInfo::info(v4l2Format).format; PixelFormat format = v4l2Format.toPixelFormat();
/* /*
* \todo This might need to be expanded as few pipeline handlers * \todo This might need to be expanded as few pipeline handlers
* report StreamFormats. * report StreamFormats.
@ -299,7 +299,7 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg)
int V4L2CameraProxy::tryFormat(struct v4l2_format *arg) int V4L2CameraProxy::tryFormat(struct v4l2_format *arg)
{ {
V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat); V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat);
PixelFormat format = PixelFormatInfo::info(v4l2Format).format; PixelFormat format = v4l2Format.toPixelFormat();
Size size(arg->fmt.pix.width, arg->fmt.pix.height); Size size(arg->fmt.pix.width, arg->fmt.pix.height);
StreamConfiguration config; StreamConfiguration config;
@ -348,8 +348,7 @@ int V4L2CameraProxy::vidioc_s_fmt(V4L2CameraFile *file, struct v4l2_format *arg)
Size size(arg->fmt.pix.width, arg->fmt.pix.height); Size size(arg->fmt.pix.width, arg->fmt.pix.height);
V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat); V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat);
ret = vcam_->configure(&streamConfig_, size, ret = vcam_->configure(&streamConfig_, size, v4l2Format.toPixelFormat(),
PixelFormatInfo::info(v4l2Format).format,
bufferCount_); bufferCount_);
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
@ -491,8 +490,7 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf
Size size(v4l2PixFormat_.width, v4l2PixFormat_.height); Size size(v4l2PixFormat_.width, v4l2PixFormat_.height);
V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat); V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat);
int ret = vcam_->configure(&streamConfig_, size, int ret = vcam_->configure(&streamConfig_, size,
PixelFormatInfo::info(v4l2Format).format, v4l2Format.toPixelFormat(), arg->count);
arg->count);
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;