[libcamera-devel] [PATCH v4 2/7] libcamera: v4l2_videodevice: Expose setSelection()
Jacopo Mondi
jacopo at jmondi.org
Mon Apr 27 23:32:31 CEST 2020
Expose V4L2Videodevice::setSelection() method and drop
V4L2Videodevice::setCrop() and V4L2Videodevice::setComopse() as wrapping
each target with a single function does not provide any benefit.
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/libcamera/include/v4l2_videodevice.h | 5 +----
src/libcamera/v4l2_videodevice.cpp | 20 +++-----------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h
index a0409e59c08f..976ef9b6dc50 100644
--- a/src/libcamera/include/v4l2_videodevice.h
+++ b/src/libcamera/include/v4l2_videodevice.h
@@ -211,8 +211,7 @@ public:
int setFormat(V4L2DeviceFormat *format);
std::map<V4L2PixelFormat, std::vector<SizeRange>> formats();
- int setCrop(Rectangle *rect);
- int setCompose(Rectangle *rect);
+ int setSelection(unsigned int target, Rectangle *rect);
int allocateBuffers(unsigned int count,
std::vector<std::unique_ptr<FrameBuffer>> *buffers);
@@ -254,8 +253,6 @@ private:
std::vector<V4L2PixelFormat> enumPixelformats();
std::vector<SizeRange> enumSizes(V4L2PixelFormat pixelFormat);
- int setSelection(unsigned int target, Rectangle *rect);
-
int requestBuffers(unsigned int count, enum v4l2_memory memoryType);
int createBuffers(unsigned int count,
std::vector<std::unique_ptr<FrameBuffer>> *buffers);
diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp
index 8d642be0d05c..b16ab82c2807 100644
--- a/src/libcamera/v4l2_videodevice.cpp
+++ b/src/libcamera/v4l2_videodevice.cpp
@@ -1108,25 +1108,11 @@ std::vector<SizeRange> V4L2VideoDevice::enumSizes(V4L2PixelFormat pixelFormat)
}
/**
- * \brief Set a crop rectangle on the V4L2 video device node
- * \param[inout] rect The rectangle describing the crop target area
+ * \brief Set a selection rectangle \a rect for \a target
+ * \param[in] target The selection target defined by the V4L2_SEL_TGT_* flags
+ * \param[inout] rect The selection rectangle to be applied
* \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 = {};
--
2.26.1
More information about the libcamera-devel
mailing list