[{"id":4373,"web_url":"https://patchwork.libcamera.org/comment/4373/","msgid":"","date":"2020-04-03T15:28:26","subject":"Re: [libcamera-devel] [PATCH] libcamera: pixelformats: replace set\n\tof modifiers with a single value","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Kaaira,\n\nOn 03/04/2020 15:12, Kaaira Gupta wrote:\n> Pixelformat class takes a set of modifiers as an input, but all the\n> values in the set are same. Hence take just one value as an input.\n> \n\nIt might be worth expanding upon what we have learned here about the\nfact that DRM fourccs 'look' like they have a per-plane modifier, but in\nfact each one must be the same (and thus there is only one modifer for a\nDRM fourcc).\n\n\nI can only see a small comment reformatting topic below, and other than\nthat, it compiles cleanly, passes checkstyle.py, and the tests still run\n(though we didn't have any tests that use modifiers :-D)\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Kaaira Gupta \n> ---\n> include/libcamera/pixelformats.h | 6 +++---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n> src/libcamera/pixelformats.cpp | 22 +++++++++++-----------\n> 3 files changed, 15 insertions(+), 15 deletions(-)\n> \n> diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h\n> index 9ce6f7f..89966e5 100644\n> --- a/include/libcamera/pixelformats.h\n> +++ b/include/libcamera/pixelformats.h\n> @@ -19,7 +19,7 @@ class PixelFormat\n> {\n> public:\n> \tPixelFormat();\n> -\texplicit PixelFormat(uint32_t fourcc, const std::set &modifiers = {});\n> +\texplicit PixelFormat(uint32_t fourcc, uint64_t modifier = 0);\n> \n> \tbool operator==(const PixelFormat &other) const;\n> \tbool operator!=(const PixelFormat &other) const { return !(*this == other); }\n> @@ -29,13 +29,13 @@ public:\n> \n> \toperator uint32_t() const { return fourcc_; }\n> \tuint32_t fourcc() const { return fourcc_; }\n> -\tconst std::set &modifiers() const { return modifiers_; }\n> +\tuint64_t modifier() const { return modifier_; }\n> \n> \tstd::string toString() const;\n> \n> private:\n> \tuint32_t fourcc_;\n> -\tstd::set modifiers_;\n> +\tuint64_t modifier_;\n> };\n> \n> } /* namespace libcamera */\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 1e114ca..219b90b 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -365,7 +365,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n> \t\tconst Size size = cfg.size;\n> \t\tconst IPU3Stream *stream;\n> \n> -\t\tif (cfg.pixelFormat.modifiers().count(IPU3_FORMAT_MOD_PACKED))\n> +\t\tif (cfg.pixelFormat.modifier() == IPU3_FORMAT_MOD_PACKED)\n> \t\t\tstream = &data_->rawStream_;\n> \t\telse if (cfg.size == sensorFormat_.size)\n> \t\t\tstream = &data_->outStream_;\n> diff --git a/src/libcamera/pixelformats.cpp b/src/libcamera/pixelformats.cpp\n> index 87557d9..a53d435 100644\n> --- a/src/libcamera/pixelformats.cpp\n> +++ b/src/libcamera/pixelformats.cpp\n> @@ -19,8 +19,8 @@ namespace libcamera {\n> * \\brief libcamera image pixel format\n> *\n> * The PixelFormat type describes the format of images in the public libcamera\n> - * API. It stores a FourCC value as a 32-bit unsigned integer and a set of\n> - * modifiers. The FourCC and modifiers values are defined in the Linux kernel\n> + * API. It stores a FourCC value as a 32-bit unsigned integer and a\n> + * modifier. The FourCC and modifier values are defined in the Linux kernel\n\nThis can be reworked to utilise 80chars per line. (the word 'modifier'\ncan move up a line :-D)\n\n> * DRM/KMS API (see linux/drm_fourcc.h).\n> */\n> \n> @@ -36,12 +36,12 @@ PixelFormat::PixelFormat()\n> }\n> \n> /**\n> - * \\brief Construct a PixelFormat from a DRM FourCC and a set of modifiers\n> + * \\brief Construct a PixelFormat from a DRM FourCC and a modifier\n> * \\param[in] fourcc A DRM FourCC\n> - * \\param[in] modifiers A set of DRM FourCC modifiers\n> + * \\param[in] modifier A DRM FourCC modifier\n> */\n> -PixelFormat::PixelFormat(uint32_t fourcc, const std::set &modifiers)\n> -\t: fourcc_(fourcc), modifiers_(modifiers)\n> +PixelFormat::PixelFormat(uint32_t fourcc, uint64_t modifier)\n> +\t: fourcc_(fourcc), modifier_(modifier)\n> {\n> }\n> \n> @@ -51,7 +51,7 @@ PixelFormat::PixelFormat(uint32_t fourcc, const std::set &modifiers)\n> */\n> bool PixelFormat::operator==(const PixelFormat &other) const\n> {\n> -\treturn fourcc_ == other.fourcc() && modifiers_ == other.modifiers_;\n> +\treturn fourcc_ == other.fourcc() && modifier_ == other.modifier_;\n> }\n> \n> /**\n> @@ -70,7 +70,7 @@ bool PixelFormat::operator<(const PixelFormat &other) const\n> \t\treturn true;\n> \tif (fourcc_ > other.fourcc_)\n> \t\treturn false;\n> -\treturn modifiers_ < modifiers_;\n> +\treturn modifier_ < other.modifier_;\n> }\n> \n> /**\n> @@ -97,9 +97,9 @@ bool PixelFormat::operator<(const PixelFormat &other) const\n> */\n> \n> /**\n> - * \\fn PixelFormat::modifiers() const\n> - * \\brief Retrieve the pixel format modifiers\n> - * \\return Set of DRM modifiers\n> + * \\fn PixelFormat::modifier() const\n> + * \\brief Retrieve the pixel format modifier\n> + * \\return DRM modifier\n> */\n> \n> /**\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1AA5A600FA\n\tfor ;\n\tFri, 3 Apr 2020 17:28: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 622C6321;\n\tFri, 3 Apr 2020 17:28:28 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nevn2t0E\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585927708;\n\tbh=TS0UiWlVBgpNfrNZZXMk5HYT5nNVSOnazLnmvOfPi0M=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=nevn2t0Ed6iaDzRs2P9gZ2qVN/QML3o88JbLpUI6oVrX/CKMmnMNJwHMXhXPV7HKI\n\tGj4vjLKVNx/uKVmn3jQi+vQuj8H2QNcI+zMS6lgRrH4jSBbrhi5eEgJ/yXLXs7wgDK\n\tIICgL9Ip+TFthDZvecl4xaX9Mx87Y1tObxK5Ud54=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Kaaira Gupta , libcamera-devel@lists.libcamera.org,\n\tHelen Koike ,\n\tVaishali Thakkar ","References":"<20200403141208.GA3005@kaaira-HP-Pavilion-Notebook>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Fri, 3 Apr 2020 16:28:26 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200403141208.GA3005@kaaira-HP-Pavilion-Notebook>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH] libcamera: pixelformats: replace set\n\tof modifiers with a single value","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","X-List-Received-Date":"Fri, 03 Apr 2020 15:28:29 -0000"}}]