From patchwork Mon Feb 3 11:42:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 2766 Return-Path: Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 52EF560446 for ; Mon, 3 Feb 2020 12:44:58 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id a5so15471812wmb.0 for ; Mon, 03 Feb 2020 03:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id; bh=jAldb2NVROYZ7IURC+0oK6/VAz+fO4hFDYTpnr/aas8=; b=mpTqPBBgLuD744MP4AmrbkSXCKFIiWXc8JjLgy00Kq5vwvEdfNKyVK3Aaw2hjaClPP JYUdSBlLQNdzgw0wrrwvRLqJEKtDSrkbKANT5o+tbVwO5vbcJu1iacdXcu/8Jd+13Jbp z8Q51G4ENoCa0Wv2wM2Sim6Nj0KQADkvUwetMGqpN/HdUq+uScZGFRGzKZEvFhyomj+y OH7PIfeQ65+1GscEwR4oOts8bJVng5YOHZepScbEpgcVay5dbVaTNpWYSu1bBgyEwKqm d2At3j3a4NxF1Uti+8nRL3LqbDF6wtGYp1g1rCjX4iYmdLURkLSWnYa6cbW+r3F+rJJ7 g4Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jAldb2NVROYZ7IURC+0oK6/VAz+fO4hFDYTpnr/aas8=; b=OnxlILOtX4pUtBg8obIbsbe2mar6bKXCSTz9BNXesB5GMt1/GiZbipc+cJq9DFj6NI oPDDPq+28o1yMBmJPl8lioPzqUQx53Uq4jvnO2419Tq6XnnM/x/orD+/zWf4V7SkiuIK IXZr6q0WQS0yTKeEYaMsziRJ/TWdHNc/lL5E25IAMv1GKheWtm8uIIsnCSBokffuQqc3 fswPSrgCED/zzdYXih7Gu1FZblI0H2a91j1U6t0CjU4Iy/d2DO4MGITrntNfuQPAClqk iSUuOugdKAPtTRm1Y6dfXDx8g7ieuwOUgbNPB+9wrl8NMo5pHyQcuq5fC1NettxZgBcG 7bEw== X-Gm-Message-State: APjAAAXAIKCz1qeqzpMy47ZkG2rNmlwQB7u/JgJx4K3R+bX942s9FQCx PdYKt+CHKaWMM3JwRC65VzlSKtN8CIieBg== X-Google-Smtp-Source: APXvYqw4+pLzgt7V74DOGBCSBPULhFQSb5OBAoICvNFgMfUbfuT5XWGXPu10jJbRykU4SJiIUF4tvA== X-Received: by 2002:a7b:c7d2:: with SMTP id z18mr28733483wmk.160.1580730297481; Mon, 03 Feb 2020 03:44:57 -0800 (PST) Received: from naushir-VirtualBox.pitowers.org (cust51-dsl50.idnet.net. [212.69.50.51]) by smtp.gmail.com with ESMTPSA id i3sm12367414wrc.6.2020.02.03.03.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 03:44:56 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Feb 2020 11:42:54 +0000 Message-Id: <20200203114254.27424-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.17.1 Subject: [libcamera-devel] [PATCH] libcamera: v4l2_videodevice: Add crop/selection control. X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Feb 2020 11:44:58 -0000 Add control for cropping/selection on a V4L2 video device through the VIDIOC_S_SELECTION ioctl. This is similar to the exising cropping control available on V4L2 sub-devices. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi --- src/libcamera/include/v4l2_videodevice.h | 5 +++ src/libcamera/v4l2_videodevice.cpp | 50 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h index e4d35ab..5de4c65 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/src/libcamera/include/v4l2_videodevice.h @@ -200,6 +200,9 @@ public: uint32_t toV4L2Fourcc(PixelFormat pixelFormat); static uint32_t toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar); + int setCrop(Rectangle *rect); + int setCompose(Rectangle *rect); + protected: std::string logPrefix() const; @@ -213,6 +216,8 @@ private: int getFormatSingleplane(V4L2DeviceFormat *format); int setFormatSingleplane(V4L2DeviceFormat *format); + int setSelection(unsigned int target, Rectangle *rect); + std::vector enumPixelformats(); std::vector enumSizes(unsigned int pixelFormat); diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 8226773..7914434 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1499,6 +1499,56 @@ uint32_t V4L2VideoDevice::toV4L2Fourcc(PixelFormat pixelFormat, bool multiplanar return 0; } +/** + * \brief Set a crop 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::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; +} + /** * \class V4L2M2MDevice * \brief Memory-to-Memory video device