[{"id":11309,"web_url":"https://patchwork.libcamera.org/comment/11309/","msgid":"<20200710071950.GA5964@pendragon.ideasonboard.com>","date":"2020-07-10T07:19:50","subject":"Re: [libcamera-devel] [PATCH v2 01/20] libcamera: ipu3: Rename\n\tmbusCodesToInfo","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Thu, Jul 09, 2020 at 10:41:09AM +0200, Jacopo Mondi wrote:\n> The mbusCodesToInfo map actually maps media bus codes to PixelFormat\n> instances. Rename the map according to its actual function.\n> \n> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  src/libcamera/pipeline/ipu3/cio2.cpp | 18 +++++++++---------\n>  1 file changed, 9 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> index 97a434a73b28..f5a01dd3ec1f 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> @@ -22,7 +22,7 @@ LOG_DECLARE_CATEGORY(IPU3)\n>  \n>  namespace {\n>  \n> -static const std::map<uint32_t, PixelFormat> mbusCodesToInfo = {\n> +static const std::map<uint32_t, PixelFormat> mbusCodesToPixelFormat = {\n\nWhile at it you could drop the static keyword here.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n>  \t{ MEDIA_BUS_FMT_SBGGR10_1X10, formats::SBGGR10_IPU3 },\n>  \t{ MEDIA_BUS_FMT_SGBRG10_1X10, formats::SGBRG10_IPU3 },\n>  \t{ MEDIA_BUS_FMT_SGRBG10_1X10, formats::SGRBG10_IPU3 },\n> @@ -95,8 +95,8 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n>  \t * cio2Codes vector sorted in ascending order.\n>  \t */\n>  \tstd::vector<unsigned int> cio2Codes;\n> -\tcio2Codes.reserve(mbusCodesToInfo.size());\n> -\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n> +\tcio2Codes.reserve(mbusCodesToPixelFormat.size());\n> +\tstd::transform(mbusCodesToPixelFormat.begin(), mbusCodesToPixelFormat.end(),\n>  \t\t       std::back_inserter(cio2Codes),\n>  \t\t       [](auto &pair) { return pair.first; });\n>  \tconst std::vector<unsigned int> &sensorCodes = sensor_->mbusCodes();\n> @@ -139,8 +139,8 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n>  \t * the CIO2 output device.\n>  \t */\n>  \tstd::vector<unsigned int> mbusCodes;\n> -\tmbusCodes.reserve(mbusCodesToInfo.size());\n> -\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n> +\tmbusCodes.reserve(mbusCodesToPixelFormat.size());\n> +\tstd::transform(mbusCodesToPixelFormat.begin(), mbusCodesToPixelFormat.end(),\n>  \t\t       std::back_inserter(mbusCodes),\n>  \t\t       [](auto &pair) { return pair.first; });\n>  \n> @@ -153,8 +153,8 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tconst auto &itInfo = mbusCodesToInfo.find(sensorFormat.mbus_code);\n> -\tif (itInfo == mbusCodesToInfo.end())\n> +\tconst auto &itInfo = mbusCodesToPixelFormat.find(sensorFormat.mbus_code);\n> +\tif (itInfo == mbusCodesToPixelFormat.end())\n>  \t\treturn -EINVAL;\n>  \n>  \tconst PixelFormatInfo &info = PixelFormatInfo::info(itInfo->second);\n> @@ -183,7 +183,7 @@ CIO2Device::generateConfiguration(Size size) const\n>  \n>  \t/* Query the sensor static information for closest match. */\n>  \tstd::vector<unsigned int> mbusCodes;\n> -\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n> +\tstd::transform(mbusCodesToPixelFormat.begin(), mbusCodesToPixelFormat.end(),\n>  \t\t       std::back_inserter(mbusCodes),\n>  \t\t       [](auto &pair) { return pair.first; });\n>  \n> @@ -194,7 +194,7 @@ CIO2Device::generateConfiguration(Size size) const\n>  \t}\n>  \n>  \tcfg.size = sensorFormat.size;\n> -\tcfg.pixelFormat = mbusCodesToInfo.at(sensorFormat.mbus_code);\n> +\tcfg.pixelFormat = mbusCodesToPixelFormat.at(sensorFormat.mbus_code);\n>  \tcfg.bufferCount = CIO2_BUFFER_COUNT;\n>  \n>  \treturn cfg;","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 1CDE8BD790\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 10 Jul 2020 07:20:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8AE54613A9;\n\tFri, 10 Jul 2020 09:19:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AF3DA61253\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Jul 2020 09:19:57 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1EBD82C0;\n\tFri, 10 Jul 2020 09:19:57 +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=\"V8qRCmTK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594365597;\n\tbh=8LwvomlzN8xNazlbPzVA/CQlIL8hHIkUM+0ytfuUBsQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=V8qRCmTKplDF6X3I7CWWGybAlrXEA3BVAPSns+L8toLP5tKw2YW8tngSmieVkTyBV\n\tOlfuZbDLWLbwAItHgfg816VLG3fF4vPfSvrZ4RrJ9eZFiV/WH44DExM2+Ajk2I05FG\n\tvemrwgsTO/XIHxyB8v6yftGyme+IfrKt1NLLfSIg=","Date":"Fri, 10 Jul 2020 10:19:50 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20200710071950.GA5964@pendragon.ideasonboard.com>","References":"<20200709084128.5316-1-jacopo@jmondi.org>\n\t<20200709084128.5316-2-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200709084128.5316-2-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 01/20] libcamera: ipu3: Rename\n\tmbusCodesToInfo","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]