{"id":8528,"url":"https://patchwork.libcamera.org/api/patches/8528/?format=json","web_url":"https://patchwork.libcamera.org/patch/8528/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200701123036.51922-2-jacopo@jmondi.org>","date":"2020-07-01T12:30:22","name":"[libcamera-devel,01/15] libcamera: ipu3: Rename mbusCodesToInfo","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"732306126eaf43fc5bc71726fa4fa70ff3eb6752","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8528/mbox/","series":[{"id":1066,"url":"https://patchwork.libcamera.org/api/series/1066/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1066","date":"2020-07-01T12:30:21","name":"libcamera: ipu3: Rework streams configuration","version":1,"mbox":"https://patchwork.libcamera.org/series/1066/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8528/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8528/checks/","tags":{},"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 855EEBF415\n\tfor ;\n\tWed, 1 Jul 2020 12:27:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2E92660C5F;\n\tWed, 1 Jul 2020 14:27:22 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 33E9B609A9\n\tfor ;\n\tWed, 1 Jul 2020 14:27:20 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id CB4B71C0015;\n\tWed, 1 Jul 2020 12:27:19 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 1 Jul 2020 14:30:22 +0200","Message-Id":"<20200701123036.51922-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200701123036.51922-1-jacopo@jmondi.org>","References":"<20200701123036.51922-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 01/15] libcamera: ipu3: Rename\n\tmbusCodesToInfo","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The mbusCodesToInfo map actually maps media bus codes to PixelFormat\ninstances. Rename the map according to its actual function.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex aa1459fb3599..2ec8fcb42d92 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -23,7 +23,7 @@ LOG_DECLARE_CATEGORY(IPU3)\n \n namespace {\n \n-static const std::map mbusCodesToInfo = {\n+static const std::map mbusCodesToPixelFormat = {\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@@ -96,8 +96,8 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \t * cio2Codes vector sorted in ascending order.\n \t */\n \tstd::vector 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 &sensorCodes = sensor_->mbusCodes();\n@@ -146,8 +146,8 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \t * the CIO2 output device.\n \t */\n \tstd::vector 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@@ -160,8 +160,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@@ -190,7 +190,7 @@ CIO2Device::generateConfiguration(Size size) const\n \n \t/* Query the sensor static information for closest match. */\n \tstd::vector 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@@ -201,7 +201,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;\n","prefixes":["libcamera-devel","01/15"]}