Patch Detail
Show a patch.
GET /api/patches/8430/?format=api
{ "id": 8430, "url": "https://patchwork.libcamera.org/api/patches/8430/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8430/", "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": "<20200625223900.1282164-6-niklas.soderlund@ragnatech.se>", "date": "2020-06-25T22:38:56", "name": "[libcamera-devel,v4,5/9] libcamera: ipu3: cio2: Consolidate information about formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2fe3276b6f6cee011dfed506b37be95db04e55b0", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8430/mbox/", "series": [ { "id": 1042, "url": "https://patchwork.libcamera.org/api/series/1042/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1042", "date": "2020-06-25T22:38:51", "name": "libcamera: ipu3: Allow zero-copy RAW stream", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1042/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8430/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8430/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 2CA2CC2E65\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 25 Jun 2020 22:39:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E366560AFF;\n\tFri, 26 Jun 2020 00:39:23 +0200 (CEST)", "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 80751609DF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Jun 2020 00:39:21 +0200 (CEST)", "from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid b40178cc-b734-11ea-933e-005056917a89;\n\tFri, 26 Jun 2020 00:39:17 +0200 (CEST)" ], "X-Halon-ID": "b40178cc-b734-11ea-933e-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 26 Jun 2020 00:38:56 +0200", "Message-Id": "<20200625223900.1282164-6-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200625223900.1282164-1-niklas.soderlund@ragnatech.se>", "References": "<20200625223900.1282164-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 5/9] libcamera: ipu3: cio2: Consolidate\n\tinformation about formats", "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": "Instead of spreading the mapping between media bus codes and V4L2 FourCC\nall over the CIO2 code collect it in a single map and extract the data\nfrom it. This is done in preparation of adding PixelFormat information\nto the mix.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n* Changes since v3\n- Use std::vector instead of std::set, and reserve space in them.\n- Use C++14 construct in std::transform()\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 52 ++++++++++++++--------------\n 1 file changed, 26 insertions(+), 26 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 1a9f185bc4e161c5..31eddbc3c7745a32 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -18,6 +18,17 @@ namespace libcamera {\n \n LOG_DECLARE_CATEGORY(IPU3)\n \n+namespace {\n+\n+static const std::map<uint32_t, V4L2PixelFormat> mbusCodesToInfo = {\n+\t{ MEDIA_BUS_FMT_SBGGR10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10) },\n+\t{ MEDIA_BUS_FMT_SGBRG10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10) },\n+\t{ MEDIA_BUS_FMT_SGRBG10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10) },\n+\t{ MEDIA_BUS_FMT_SRGGB10_1X10, V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10) },\n+};\n+\n+} /* namespace */\n+\n CIO2Device::CIO2Device()\n \t: output_(nullptr), csi2_(nullptr), sensor_(nullptr)\n {\n@@ -81,10 +92,11 @@ 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-\tconst std::vector<unsigned int> cio2Codes{ MEDIA_BUS_FMT_SBGGR10_1X10,\n-\t\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n-\t\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n-\t\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 };\n+\tstd::vector<unsigned int> cio2Codes;\n+\tcio2Codes.reserve(mbusCodesToInfo.size());\n+\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.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 \tif (!utils::set_overlap(sensorCodes.begin(), sensorCodes.end(),\n \t\t\t\tcio2Codes.begin(), cio2Codes.end())) {\n@@ -128,11 +140,13 @@ 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-\tsensorFormat = sensor_->getFormat({ MEDIA_BUS_FMT_SBGGR10_1X10,\n-\t\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n-\t\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n-\t\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10 },\n-\t\t\t\t\t size);\n+\tstd::vector<unsigned int> mbusCodes;\n+\tmbusCodes.reserve(mbusCodesToInfo.size());\n+\tstd::transform(mbusCodesToInfo.begin(), mbusCodesToInfo.end(),\n+\t\t std::back_inserter(mbusCodes),\n+\t\t [](auto &pair) { return pair.first; });\n+\n+\tsensorFormat = sensor_->getFormat(mbusCodes, size);\n \tret = sensor_->setFormat(&sensorFormat);\n \tif (ret)\n \t\treturn ret;\n@@ -141,25 +155,11 @@ int CIO2Device::configure(const Size &size, V4L2DeviceFormat *outputFormat)\n \tif (ret)\n \t\treturn ret;\n \n-\tV4L2PixelFormat v4l2Format;\n-\tswitch (sensorFormat.mbus_code) {\n-\tcase MEDIA_BUS_FMT_SBGGR10_1X10:\n-\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10);\n-\t\tbreak;\n-\tcase MEDIA_BUS_FMT_SGBRG10_1X10:\n-\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10);\n-\t\tbreak;\n-\tcase MEDIA_BUS_FMT_SGRBG10_1X10:\n-\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10);\n-\t\tbreak;\n-\tcase MEDIA_BUS_FMT_SRGGB10_1X10:\n-\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10);\n-\t\tbreak;\n-\tdefault:\n+\tconst auto &itInfo = mbusCodesToInfo.find(sensorFormat.mbus_code);\n+\tif (itInfo == mbusCodesToInfo.end())\n \t\treturn -EINVAL;\n-\t}\n \n-\toutputFormat->fourcc = v4l2Format;\n+\toutputFormat->fourcc = itInfo->second;\n \toutputFormat->size = sensorFormat.size;\n \toutputFormat->planesCount = 1;\n \n", "prefixes": [ "libcamera-devel", "v4", "5/9" ] }