[{"id":11490,"web_url":"https://patchwork.libcamera.org/comment/11490/","msgid":"","date":"2020-07-22T13:40:26","subject":"Re: [libcamera-devel] [PATCH 1/7] libcamera: formats: Move isRaw()\n\thelper to formats.cpp","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Kaaira,\n\nAha, this sounds useful. A few fixups though\n\nOn 22/07/2020 14:30, Kaaira Gupta wrote:\n> isRaw() helper is used in subsequent patches by VIMC as well. Hence move\n> it from raspberrypi pippeline handler to a common place to make it\n> reusable.\n\ns/pippeline/pippeline/\n\n\n> Signed-off-by: Kaaira Gupta \n> ---\n> include/libcamera/internal/formats.h | 1 +\n> src/libcamera/formats.cpp | 13 +++++++++\n> .../pipeline/raspberrypi/raspberrypi.cpp | 27 ++++++++-----------\n> 3 files changed, 25 insertions(+), 16 deletions(-)\n> \n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index cad41ad..8032fab 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -49,6 +49,7 @@ public:\n> \t};\n> \n> \tbool isValid() const { return format.isValid(); }\n> +\tbool isRaw(PixelFormat &pixFmt) const;\n\nWe need to parse the PixelFormatInfo, and you are adding the method to\nthat class (which is good), but that makes passing the PixelFormat\nredundant.\n\n\n\n> \n> \tstatic const PixelFormatInfo &info(const PixelFormat &format);\n> \tstatic const PixelFormatInfo &info(const V4L2PixelFormat &format);\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index af3996c..efb7de9 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -853,4 +853,17 @@ PixelFormatInfo::frameSize(const Size &size,\n> \treturn sum;\n> }\n> \n> +/**\n> + * \\brief Check if given pixel format is RAW or not\n> + * \\return True if the format is RAW, false otherwise\n> + */\n> +bool PixelFormatInfo::isRaw(PixelFormat &pixFmt) const\n> +{\n> +\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixFmt);\n> +\tif (!info.isValid())\n> +\t\treturn false;\n\nYou don't need to 'find' the PixelFormatInfo, because you're already\nexecuting code 'on' a PixelFormatInfo (this member function is a\nfunction on a PixelFormatInfo), so you can directly access it's member\nvariables.\n\n> +\n> +\treturn info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n\n\nSo I believe this could then become:\n\n\treturn colourEncoding == ColourEncodingRAW;\n\n\n\n> +}\n> +\n> } /* namespace libcamera */\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index bf1c771..8f35434 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -43,19 +43,6 @@ using V4L2PixFmtMap = std::map>;\n> \n> namespace {\n> \n> -bool isRaw(PixelFormat &pixFmt)\n> -{\n> -\t/*\n> -\t * The isRaw test might be redundant right now the pipeline handler only\n> -\t * supports RAW sensors. Leave it in for now, just as a sanity check.\n> -\t */\n> -\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixFmt);\n> -\tif (!info.isValid())\n> -\t\treturn false;\n> -\n> -\treturn info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n> -}\n> -\n> double scoreFormat(double desired, double actual)\n> {\n> \tdouble score = desired - actual;\n> @@ -405,7 +392,13 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n> \tstd::pair outSize[2];\n> \tSize maxSize;\n> \tfor (StreamConfiguration &cfg : config_) {\n> -\t\tif (isRaw(cfg.pixelFormat)) {\n> +\t\t/*\n> +\t\t * The isRaw test might be redundant right now the pipeline handler only\n> +\t\t * supports RAW sensors. Leave it in for now, just as a sanity check.\n> +\t\t */\n> +\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n> +\n> +\t\tif (info.isRaw(cfg.pixelFormat)) {\n> \t\t\t/*\n> \t\t\t * Calculate the best sensor mode we can use based on\n> \t\t\t * the user request.\n> @@ -616,8 +609,9 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> \t */\n> \tfor (unsigned i = 0; i < config->size(); i++) {\n> \t\tStreamConfiguration &cfg = config->at(i);\n> +\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);\n> \n> -\t\tif (isRaw(cfg.pixelFormat)) {\n> +\t\tif (info.isRaw(cfg.pixelFormat)) {\n> \t\t\t/*\n> \t\t\t * If we have been given a RAW stream, use that size\n> \t\t\t * for setting up the sensor.\n> @@ -661,7 +655,8 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> \tfor (unsigned i = 0; i < config->size(); i++) {\n> \t\tStreamConfiguration &cfg = config->at(i);\n> \n> -\t\tif (isRaw(cfg.pixelFormat)) {\n> +\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(cfg..pixelFormat);\n> +\t\tif (info.isRaw(cfg.pixelFormat)) {\n> \t\t\tcfg.setStream(&data->isp_[Isp::Input]);\n> \t\t\tdata->isp_[Isp::Input].setExternal(true);\n> \t\t\tcontinue;\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 2D906BDB1B\n\tfor ;\n\tWed, 22 Jul 2020 13:40:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B7FE960540;\n\tWed, 22 Jul 2020 15:40:31 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BB3986053C\n\tfor ;\n\tWed, 22 Jul 2020 15:40:29 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2906E329;\n\tWed, 22 Jul 2020 15:40:29 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"OgV5PsNI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1595425229;\n\tbh=i+0xo7M/FrNYBhOePBEgYslxrdxvSOUuwiCCLaomeHo=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=OgV5PsNIpQeZQ8nquBfp7ae+maP3TbHXlHJDsrZsgA7UdJ432x1c/gnxfdN8j+Ywm\n\tLk74+CiJ9MJ7ndifoguzkGwWxtmygD0NG/XPsVD+OgTzHObe/njvPXWaUF1suf3qRy\n\tfp0XP/tdZsA/+0oLsYwiXm9DMTqJc/NvIAt7a7QQ=","To":"Kaaira Gupta , libcamera-devel@lists.libcamera.org","References":"<20200722133009.26528-1-kgupta@es.iitr.ac.in>\n\t<20200722133009.26528-2-kgupta@es.iitr.ac.in>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Wed, 22 Jul 2020 14:40:26 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200722133009.26528-2-kgupta@es.iitr.ac.in>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 1/7] libcamera: formats: Move isRaw()\n\thelper to formats.cpp","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]