Patch Detail
Show a patch.
GET /api/patches/8530/?format=api
{ "id": 8530, "url": "https://patchwork.libcamera.org/api/patches/8530/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8530/", "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": "<20200701123036.51922-4-jacopo@jmondi.org>", "date": "2020-07-01T12:30:24", "name": "[libcamera-devel,03/15] libcamera: ipu3: cio2: Report format and sizes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1e7eb97437d8b1b787b557bd5e6065e6f508ea4c", "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/8530/mbox/", "series": [ { "id": 1066, "url": "https://patchwork.libcamera.org/api/series/1066/?format=api", "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/8530/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8530/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 C4989C2E69\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Jul 2020 12:27:23 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 68A5060CA5;\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 48BFB609A9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Jul 2020 14:27:21 +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 DAD641C0009;\n\tWed, 1 Jul 2020 12:27:20 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 1 Jul 2020 14:30:24 +0200", "Message-Id": "<20200701123036.51922-4-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 03/15] libcamera: ipu3: cio2: Report\n\tformat and sizes", "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=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add two methods to the CIO2Device class to retrieve all the supported\nPixelFormats and sizes.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 43 +++++++++++++++++++++++++++-\n src/libcamera/pipeline/ipu3/cio2.h | 7 +++++\n 2 files changed, 49 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 2ec8fcb42d92..b34194c5097f 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -33,7 +33,7 @@ static const std::map<uint32_t, PixelFormat> mbusCodesToPixelFormat = {\n } /* namespace */\n \n CIO2Device::CIO2Device()\n-\t: sensor_(nullptr), csi2_(nullptr), output_(nullptr)\n+\t: sensor_(nullptr), csi2_(nullptr), output_(nullptr), initialized_(false)\n {\n }\n \n@@ -44,6 +44,45 @@ CIO2Device::~CIO2Device()\n \tdelete sensor_;\n }\n \n+/**\n+ * \\brief Retrieve the list of supported PixelFormats\n+ *\n+ * Retrieve the list of supported pixel formats by matching the sensor produced\n+ * media bus codes with the formats supported by the CIO2 unit.\n+ *\n+ * \\return The list of supported PixelFormat\n+ */\n+std::vector<PixelFormat> CIO2Device::formats() const\n+{\n+\tif (!initialized_)\n+\t\treturn {};\n+\n+\tstd::vector<PixelFormat> formats;\n+\tfor (unsigned int code : sensor_->mbusCodes()) {\n+\t\tauto it = mbusCodesToPixelFormat.find(code);\n+\t\tif (it != mbusCodesToPixelFormat.end())\n+\t\t\tformats.push_back(it->second);\n+\t}\n+\n+\treturn formats;\n+}\n+\n+/**\n+ * \\brief Retrieve the list of supported size ranges\n+ * \\return The list of supported SizeRange\n+ */\n+std::vector<SizeRange> CIO2Device::sizes() const\n+{\n+\tif (!initialized_)\n+\t\treturn {};\n+\n+\tstd::vector<SizeRange> sizes;\n+\tfor (const Size &size : sensor_->sizes())\n+\t\tsizes.emplace_back(size, size);\n+\n+\treturn sizes;\n+}\n+\n /**\n * \\brief Initialize components of the CIO2 device with \\a index\n * \\param[in] media The CIO2 media device\n@@ -127,6 +166,8 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \n \toutput_->bufferReady.connect(this, &CIO2Device::cio2BufferReady);\n \n+\tinitialized_ = true;\n+\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex dc764b101f11..7e793e8450f5 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -18,7 +18,9 @@ namespace libcamera {\n class CameraSensor;\n class FrameBuffer;\n class MediaDevice;\n+class PixelFormat;\n class Request;\n+class SizeRange;\n class V4L2DeviceFormat;\n class V4L2Subdevice;\n class V4L2VideoDevice;\n@@ -33,6 +35,9 @@ public:\n \tCIO2Device();\n \t~CIO2Device();\n \n+\tstd::vector<PixelFormat> formats() const;\n+\tstd::vector<SizeRange> sizes() const;\n+\n \tint init(const MediaDevice *media, unsigned int index);\n \tint configure(const Size &size, V4L2DeviceFormat *outputFormat);\n \n@@ -61,6 +66,8 @@ private:\n \n \tstd::vector<std::unique_ptr<FrameBuffer>> buffers_;\n \tstd::queue<FrameBuffer *> availableBuffers_;\n+\n+\tbool initialized_;\n };\n \n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "03/15" ] }