Patch Detail
Show a patch.
GET /api/patches/8873/?format=api
{ "id": 8873, "url": "https://patchwork.libcamera.org/api/patches/8873/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8873/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200720104736.19986-2-jacopo@jmondi.org>", "date": "2020-07-20T10:47:18", "name": "[libcamera-devel,v4,01/19] libcamera: ipu3: Rename mbusCodesToInfo", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7f3b5a8de5780409daebe345dcc18a7720ab75ec", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8873/mbox/", "series": [ { "id": 1118, "url": "https://patchwork.libcamera.org/api/series/1118/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1118", "date": "2020-07-20T10:47:17", "name": "ipu3: rework pipe confiuguration", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1118/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8873/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8873/checks/", "tags": {}, "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 4E447C0109\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 20 Jul 2020 10:44:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1F029605B7;\n\tMon, 20 Jul 2020 12:44:16 +0200 (CEST)", "from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D5F4460537\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 Jul 2020 12:44:13 +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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A7C8060011;\n\tMon, 20 Jul 2020 10:44:12 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 20 Jul 2020 12:47:18 +0200", "Message-Id": "<20200720104736.19986-2-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200720104736.19986-1-jacopo@jmondi.org>", "References": "<20200720104736.19986-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 01/19] 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>", "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>" }, "content": "The mbusCodesToInfo map actually maps media bus codes to PixelFormat\ninstances. Rename the map according to its actual function and while at\nit drop the 'static' keyword as the map is already defined in an\nanonymous namespace.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex cb8c80a4a9ca..77f54da47e28 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+const std::map<uint32_t, PixelFormat> 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@@ -94,7 +94,7 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \t * utils::set_overlap requires the ranges to be sorted, keep the\n \t * cio2Codes vector sorted in ascending order.\n \t */\n-\tstd::vector<unsigned int> cio2Codes = utils::map_keys(mbusCodesToInfo);\n+\tstd::vector<unsigned int> cio2Codes = utils::map_keys(mbusCodesToPixelFormat);\n \tconst std::vector<unsigned int> &sensorCodes = sensor_->mbusCodes();\n \tif (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),\n \t\t\t\tcio2Codes.begin(), cio2Codes.end())) {\n@@ -134,7 +134,7 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \t * Apply the selected format to the sensor, the CSI-2 receiver and\n \t * the CIO2 output device.\n \t */\n-\tstd::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToInfo);\n+\tstd::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToPixelFormat);\n \tsensorFormat = sensor_->getFormat(mbusCodes, size);\n \tret = sensor_->setFormat(&sensorFormat);\n \tif (ret)\n@@ -144,8 +144,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@@ -173,7 +173,7 @@ CIO2Device::generateConfiguration(Size size) const\n \t\tsize = sensor_->resolution();\n \n \t/* Query the sensor static information for closest match. */\n-\tstd::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToInfo);\n+\tstd::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToPixelFormat);\n \tV4L2SubdeviceFormat sensorFormat = sensor_->getFormat(mbusCodes, size);\n \tif (!sensorFormat.mbus_code) {\n \t\tLOG(IPU3, Error) << \"Sensor does not support mbus code\";\n@@ -181,7 +181,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", "v4", "01/19" ] }