Message ID | 20210903202305.17689-1-laurent.pinchart@ideasonboard.com |
---|---|
State | Accepted |
Commit | e6886f63529bce803433158bb81dfb6550b5b10c |
Headers | show |
Series |
|
Related | show |
Hi Laurent, On 9/4/21 1:53 AM, Laurent Pinchart wrote: > 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> > --- > src/v4l2/v4l2_camera_proxy.cpp | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp > index 7682c4bddf90..07b1a90aa32f 100644 > --- a/src/v4l2/v4l2_camera_proxy.cpp > +++ b/src/v4l2/v4l2_camera_proxy.cpp > @@ -243,7 +243,7 @@ int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_fr > LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << file->efd(); > > 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 > * report StreamFormats. > @@ -299,7 +299,7 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg) > int V4L2CameraProxy::tryFormat(struct v4l2_format *arg) > { > 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); > > 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); > V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat); > - ret = vcam_->configure(&streamConfig_, size, > - PixelFormatInfo::info(v4l2Format).format, > + ret = vcam_->configure(&streamConfig_, size, v4l2Format.toPixelFormat(), > bufferCount_); > if (ret < 0) > return -EINVAL; > @@ -491,8 +490,7 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf > Size size(v4l2PixFormat_.width, v4l2PixFormat_.height); > V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat); > int ret = vcam_->configure(&streamConfig_, size, > - PixelFormatInfo::info(v4l2Format).format, > - arg->count); > + v4l2Format.toPixelFormat(), arg->count); > if (ret < 0) > return -EINVAL; >
On 03/09/2021 21:23, Laurent Pinchart wrote: > Replace the open-coded PixelFormat lookup with the > V4L2PixelFormat::toPixelFormat() helper function. This simplifies the > implementation. Looks ok to me too, Reviewed-by: Kieran Bingham <kieran.bingham@ideasoboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > src/v4l2/v4l2_camera_proxy.cpp | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp > index 7682c4bddf90..07b1a90aa32f 100644 > --- a/src/v4l2/v4l2_camera_proxy.cpp > +++ b/src/v4l2/v4l2_camera_proxy.cpp > @@ -243,7 +243,7 @@ int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_fr > LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << file->efd(); > > 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 > * report StreamFormats. > @@ -299,7 +299,7 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg) > int V4L2CameraProxy::tryFormat(struct v4l2_format *arg) > { > 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); > > 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); > V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat); > - ret = vcam_->configure(&streamConfig_, size, > - PixelFormatInfo::info(v4l2Format).format, > + ret = vcam_->configure(&streamConfig_, size, v4l2Format.toPixelFormat(), > bufferCount_); > if (ret < 0) > return -EINVAL; > @@ -491,8 +490,7 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf > Size size(v4l2PixFormat_.width, v4l2PixFormat_.height); > V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat); > int ret = vcam_->configure(&streamConfig_, size, > - PixelFormatInfo::info(v4l2Format).format, > - arg->count); > + v4l2Format.toPixelFormat(), arg->count); > if (ret < 0) > return -EINVAL; > >
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 7682c4bddf90..07b1a90aa32f 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -243,7 +243,7 @@ int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_fr LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << file->efd(); 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 * report StreamFormats. @@ -299,7 +299,7 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg) int V4L2CameraProxy::tryFormat(struct v4l2_format *arg) { 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); 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); V4L2PixelFormat v4l2Format = V4L2PixelFormat(arg->fmt.pix.pixelformat); - ret = vcam_->configure(&streamConfig_, size, - PixelFormatInfo::info(v4l2Format).format, + ret = vcam_->configure(&streamConfig_, size, v4l2Format.toPixelFormat(), bufferCount_); if (ret < 0) return -EINVAL; @@ -491,8 +490,7 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf Size size(v4l2PixFormat_.width, v4l2PixFormat_.height); V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat); int ret = vcam_->configure(&streamConfig_, size, - PixelFormatInfo::info(v4l2Format).format, - arg->count); + v4l2Format.toPixelFormat(), arg->count); if (ret < 0) return -EINVAL;
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> --- src/v4l2/v4l2_camera_proxy.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)