From ea3a00bc33f950c794e8b6d8cf0201a24c0c3d0d Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Tue, 4 Feb 2020 11:24:44 +0000 Subject: libcamera: v4l2_videodevice: Add crop/selection control 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 Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/libcamera/include/v4l2_videodevice.h | 5 ++++ src/libcamera/v4l2_videodevice.cpp | 48 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) (limited to 'src') diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h index e4d35ab3..fcf07264 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/src/libcamera/include/v4l2_videodevice.h @@ -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> *buffers); int importBuffers(unsigned int count); @@ -216,6 +219,8 @@ private: std::vector enumPixelformats(); std::vector enumSizes(unsigned int pixelFormat); + int setSelection(unsigned int target, Rectangle *rect); + int requestBuffers(unsigned int count); std::unique_ptr createBuffer(const struct v4l2_buffer &buf); FileDescriptor exportDmabufFd(unsigned int index, unsigned int plane); diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index b874f238..99470ce1 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -942,6 +942,54 @@ std::vector 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 = {}; -- cgit v1.2.1