From patchwork Tue Jul 14 23:40:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8803 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F0C45BD792 for ; Tue, 14 Jul 2020 23:40:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BC72C60925; Wed, 15 Jul 2020 01:40:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="N10QWH/c"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B11460905 for ; Wed, 15 Jul 2020 01:40:21 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F06EA10F6 for ; Wed, 15 Jul 2020 01:40:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1594770021; bh=waPAdl26c/ZnBNcOAGTj55qxffTbdd90yd6MIYQptEY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=N10QWH/cFeGe24Y/LvyoQH4BVSXm0bPrWFdcBR//QxDj5ZSvtjfyd7IStLeUSb69B hNBE5QhOGam3V8rBpRRuTfY+XVEqlxuKloh6QXSrcDLALbLwc1XG1/5iJpxEdZew2S sJcoqbJXYIiCrwytj1wLsa+10j6icpEUcp5KNLQQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 15 Jul 2020 02:40:07 +0300 Message-Id: <20200714234009.16596-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714234009.16596-1-laurent.pinchart@ideasonboard.com> References: <20200714234009.16596-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/5] libcamera: geometry: Give constructors to Rectangle 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Rectangle, unlike Size, has no constructor, requiring the users to explicitly initialize the instances. This is error-prone, add constructors. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/geometry.h | 15 +++++++++++++ src/libcamera/camera_sensor.cpp | 2 +- src/libcamera/geometry.cpp | 22 +++++++++++++++++++ src/libcamera/pipeline/ipu3/imgu.cpp | 7 +----- .../pipeline/raspberrypi/raspberrypi.cpp | 7 +----- src/libcamera/pipeline/vimc/vimc.cpp | 7 +----- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h index f3088d33fa2c..380248ac9a50 100644 --- a/include/libcamera/geometry.h +++ b/include/libcamera/geometry.h @@ -127,6 +127,21 @@ static inline bool operator!=(const SizeRange &lhs, const SizeRange &rhs) } struct Rectangle { + Rectangle() + : Rectangle(0, 0, 0, 0) + { + } + + Rectangle(int xpos, int ypos, const Size &size) + : x(xpos), y(ypos), width(size.width), height(size.height) + { + } + + Rectangle(int xpos, int ypos, unsigned int w, unsigned int h) + : x(xpos), y(ypos), width(w), height(h) + { + } + int x; int y; unsigned int width; diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index b14b4051dca6..6e93cc51155b 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -487,7 +487,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const info->model = model(); /* Get the active area size. */ - Rectangle rect = {}; + Rectangle rect; int ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP_DEFAULT, &rect); if (ret) { LOG(CameraSensor, Error) diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 5a0bcf7c1e12..3a3784df39e6 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -297,6 +297,28 @@ bool operator==(const SizeRange &lhs, const SizeRange &rhs) * refers to, are defined by the context were rectangle is used. */ +/** + * \fn Rectangle::Rectangle() + * \brief Construct a Rectangle with all coordinates set to 0 + */ + +/** + * \fn Rectangle::Rectangle(int x, int y, const Size &size) + * \brief Construct a Rectangle with the given position and size + * \param[in] x The horizontal coordinate of the top-left corner + * \param[in] y The vertical coordinate of the top-left corner + * \param[in] size The size + */ + +/** + * \fn Rectangle::Rectangle(int x, int y, unsigned int width, unsigned int height) + * \brief Construct a Rectangle with the given position and size + * \param[in] x The horizontal coordinate of the top-left corner + * \param[in] y The vertical coordinate of the top-left corner + * \param[in] width The width + * \param[in] height The height + */ + /** * \var Rectangle::x * \brief The horizontal coordinate of the rectangle's top-left corner diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp index d7f4173d3607..4bec4b2f1a76 100644 --- a/src/libcamera/pipeline/ipu3/imgu.cpp +++ b/src/libcamera/pipeline/ipu3/imgu.cpp @@ -100,12 +100,7 @@ int ImgUDevice::configureInput(const Size &size, * to configure the crop/compose rectangles, contradicting the * V4L2 specification. */ - Rectangle rect = { - .x = 0, - .y = 0, - .width = inputFormat->size.width, - .height = inputFormat->size.height, - }; + Rectangle rect{ 0, 0, inputFormat->size }; ret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_CROP, &rect); if (ret) return ret; diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 009e502b288c..2d848ac3c735 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -752,12 +752,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config) } /* Adjust aspect ratio by providing crops on the input image. */ - Rectangle crop = { - .x = 0, - .y = 0, - .width = sensorFormat.size.width, - .height = sensorFormat.size.height - }; + Rectangle crop{ 0, 0, sensorFormat.size }; int ar = maxSize.height * sensorFormat.size.width - maxSize.width * sensorFormat.size.height; if (ar > 0) diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index a6f457c71fb1..4f461b928514 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -256,12 +256,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config) return ret; if (data->media_->version() >= KERNEL_VERSION(5, 6, 0)) { - Rectangle crop = { - .x = 0, - .y = 0, - .width = subformat.size.width, - .height = subformat.size.height, - }; + Rectangle crop{ 0, 0, subformat.size }; ret = data->scaler_->setSelection(0, V4L2_SEL_TGT_CROP, &crop); if (ret) return ret;