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

libcamera: v4l2_videodevice: Add crop/selection control

Browse source 
Add control for cropping/selection on a V4L2 video device through
the VIDIOC_S_SELECTION ioctl. This is similar to the existing cropping
control available on V4L2 sub-devices.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2020-02-04 11:24:44 +00:00 • committed by Laurent Pinchart
parent 5dc5fb2ac5
commit ea3a00bc33
2 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcamera/include/v4l2_videodevice.h
View file

@ -182,6 +182,9 @@ public:
int setFormat(V4L2DeviceFormat *format);
ImageFormats formats();
int setCrop(Rectangle *rect);
int setCompose(Rectangle *rect);
int exportBuffers(unsigned int count,
std::vector<std::unique_ptr<FrameBuffer>> *buffers);
int importBuffers(unsigned int count);
@ -216,6 +219,8 @@ private:
std::vector<unsigned int> enumPixelformats();
std::vector<SizeRange> enumSizes(unsigned int pixelFormat);
int setSelection(unsigned int target, Rectangle *rect);
int requestBuffers(unsigned int count);
std::unique_ptr<FrameBuffer> createBuffer(const struct v4l2_buffer &buf);
FileDescriptor exportDmabufFd(unsigned int index, unsigned int plane);

48
src/libcamera/v4l2_videodevice.cpp
View file

@ -942,6 +942,54 @@ std::vector<SizeRange> V4L2VideoDevice::enumSizes(unsigned int pixelFormat)
return sizes;
}
/**
* \brief Set a crop rectangle on the V4L2 video device node
* \param[inout] rect The rectangle describing the crop target area
* \return 0 on success or a negative error code otherwise
*/
int V4L2VideoDevice::setCrop(Rectangle *rect)
{
return setSelection(V4L2_SEL_TGT_CROP, rect);
}
/**
* \brief Set a compose rectangle on the V4L2 video device node
* \param[inout] rect The rectangle describing the compose target area
* \return 0 on success or a negative error code otherwise
*/
int V4L2VideoDevice::setCompose(Rectangle *rect)
{
return setSelection(V4L2_SEL_TGT_COMPOSE, rect);
}
int V4L2VideoDevice::setSelection(unsigned int target, Rectangle *rect)
{
struct v4l2_selection sel = {};
sel.type = bufferType_;
sel.target = target;
sel.flags = 0;
sel.r.left = rect->x;
sel.r.top = rect->y;
sel.r.width = rect->w;
sel.r.height = rect->h;
int ret = ioctl(VIDIOC_S_SELECTION, &sel);
if (ret < 0) {
LOG(V4L2, Error) << "Unable to set rectangle " << target
<< ": " << strerror(-ret);
return ret;
}
rect->x = sel.r.left;
rect->y = sel.r.top;
rect->w = sel.r.width;
rect->h = sel.r.height;
return 0;
}
int V4L2VideoDevice::requestBuffers(unsigned int count)
{
struct v4l2_requestbuffers rb = {};