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

v4l2: camera_proxy: Break out try_fmt

Browse source 
Calling vidioc_s_fmt() calls vidioc_try_fmt() duplicating prinouts.

Breakout try format procedure and call it from both functions.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-01-07 17:47:09 +01:00
parent 769ca0a550
commit fce110c6d9
2 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/v4l2/v4l2_camera_proxy.cpp
View file

@ -235,13 +235,39 @@ int V4L2CameraProxy::vidioc_g_fmt(struct v4l2_format *arg)
return 0; return 0;
} }
void V4L2CameraProxy::tryFormat(struct v4l2_format *arg)
{
PixelFormat format = v4l2ToDrm(arg->fmt.pix.pixelformat);
const std::vector<PixelFormat> &formats =
streamConfig_.formats().pixelformats();
if (std::find(formats.begin(), formats.end(), format) == formats.end())
format = streamConfig_.formats().pixelformats()[0];
Size size(arg->fmt.pix.width, arg->fmt.pix.height);
const std::vector<Size> &sizes = streamConfig_.formats().sizes(format);
if (std::find(sizes.begin(), sizes.end(), size) == sizes.end())
size = streamConfig_.formats().sizes(format)[0];
arg->fmt.pix.width = size.width;
arg->fmt.pix.height = size.height;
arg->fmt.pix.pixelformat = drmToV4L2(format);
arg->fmt.pix.field = V4L2_FIELD_NONE;
arg->fmt.pix.bytesperline = bplMultiplier(drmToV4L2(format)) *
arg->fmt.pix.width;
arg->fmt.pix.sizeimage = imageSize(drmToV4L2(format),
arg->fmt.pix.width,
arg->fmt.pix.height);
arg->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
}
int V4L2CameraProxy::vidioc_s_fmt(struct v4l2_format *arg) int V4L2CameraProxy::vidioc_s_fmt(struct v4l2_format *arg)
{ {
LOG(V4L2Compat, Debug) << "Servicing vidioc_s_fmt"; LOG(V4L2Compat, Debug) << "Servicing vidioc_s_fmt";
int ret = vidioc_try_fmt(arg); if (!validateBufferType(arg->type))
if (ret < 0) return -EINVAL;
return ret;
tryFormat(arg);
Size size(arg->fmt.pix.width, arg->fmt.pix.height); Size size(arg->fmt.pix.width, arg->fmt.pix.height);
ret = vcam_->invokeMethod(&V4L2Camera::configure, ret = vcam_->invokeMethod(&V4L2Camera::configure,
@ -269,27 +295,7 @@ int V4L2CameraProxy::vidioc_try_fmt(struct v4l2_format *arg)
if (!validateBufferType(arg->type)) if (!validateBufferType(arg->type))
return -EINVAL; return -EINVAL;
PixelFormat format = v4l2ToDrm(arg->fmt.pix.pixelformat); tryFormat(arg);
const std::vector<PixelFormat> &formats =
streamConfig_.formats().pixelformats();
if (std::find(formats.begin(), formats.end(), format) == formats.end())
format = streamConfig_.formats().pixelformats()[0];
Size size(arg->fmt.pix.width, arg->fmt.pix.height);
const std::vector<Size> &sizes = streamConfig_.formats().sizes(format);
if (std::find(sizes.begin(), sizes.end(), size) == sizes.end())
size = streamConfig_.formats().sizes(format)[0];
arg->fmt.pix.width = size.width;
arg->fmt.pix.height = size.height;
arg->fmt.pix.pixelformat = drmToV4L2(format);
arg->fmt.pix.field = V4L2_FIELD_NONE;
arg->fmt.pix.bytesperline = bplMultiplier(drmToV4L2(format)) *
arg->fmt.pix.width;
arg->fmt.pix.sizeimage = imageSize(drmToV4L2(format),
arg->fmt.pix.width,
arg->fmt.pix.height);
arg->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
return 0; return 0;
} }

1
src/v4l2/v4l2_camera_proxy.h
View file

@ -39,6 +39,7 @@ private:
void setFmtFromConfig(StreamConfiguration &streamConfig); void setFmtFromConfig(StreamConfiguration &streamConfig);
unsigned int calculateSizeImage(StreamConfiguration &streamConfig); unsigned int calculateSizeImage(StreamConfiguration &streamConfig);
void querycap(std::shared_ptr<Camera> camera); void querycap(std::shared_ptr<Camera> camera);
void tryFormat(struct v4l2_format *arg);
void updateBuffers(); void updateBuffers();
int freeBuffers(); int freeBuffers();