Patch Detail
Show a patch.
GET /api/patches/8697/?format=api
{ "id": 8697, "url": "https://patchwork.libcamera.org/api/patches/8697/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8697/", "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": "<20200709084128.5316-7-jacopo@jmondi.org>", "date": "2020-07-09T08:41:14", "name": "[libcamera-devel,v2,06/20] libcamera: ipu3: Report StreamFormats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5a16966eb987b7082b349454feffc4e5d0cd82f5", "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/8697/mbox/", "series": [ { "id": 1091, "url": "https://patchwork.libcamera.org/api/series/1091/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1091", "date": "2020-07-09T08:41:08", "name": "libcamera: ipu3: Rework configuration", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1091/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8697/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8697/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 BEF8BBDB1C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 9 Jul 2020 08:38:12 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 66DCD611AA;\n\tThu, 9 Jul 2020 10:38:12 +0200 (CEST)", "from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5096B61169\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 9 Jul 2020 10:38:10 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 6F205100015;\n\tThu, 9 Jul 2020 08:38:08 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 9 Jul 2020 10:41:14 +0200", "Message-Id": "<20200709084128.5316-7-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200709084128.5316-1-jacopo@jmondi.org>", "References": "<20200709084128.5316-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 06/20] libcamera: ipu3: Report\n\tStreamFormats", "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": "Report StreamFormats associated to each StreamConfiguration generated\nby the IPU3 pipeline handler.\n\nThe StreamFormats are generated differently for RAW and processed\nstreams, with the former using the sensor enumerated resolutions and\nthe latter using a continuous range of sizes constructed by matching the\nsensor capabilities with the platform constraints.\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 50 ++++++++++++++++++----------\n 1 file changed, 33 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 978a6e58c72f..d27acb405a1d 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -306,7 +306,10 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \n \tSize sensorResolution = data->cio2_.sensor()->resolution();\n \tfor (const StreamRole role : roles) {\n-\t\tStreamConfiguration cfg = {};\n+\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n+\t\tunsigned int bufferCount;\n+\t\tPixelFormat pixelFormat;\n+\t\tSize size;\n \n \t\tswitch (role) {\n \t\tcase StreamRole::StillCapture:\n@@ -314,20 +317,27 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\t * Use the sensor resolution aligned to the ImgU\n \t\t\t * output constraints.\n \t\t\t */\n-\t\t\tcfg.size.width = std::min(sensorResolution.width,\n-\t\t\t\t\t\t IPU3_OUTPUT_MAX_WIDTH);\n-\t\t\tcfg.size.height = std::min(sensorResolution.height,\n-\t\t\t\t\t\t IPU3_OUTPUT_MAX_HEIGHT);\n-\t\t\tcfg.size.width &= ~IPU3_OUTPUT_WIDTH_ALIGN;\n-\t\t\tcfg.size.height &= ~IPU3_OUTPUT_HEIGHT_ALIGN;\n-\t\t\tcfg.pixelFormat = formats::NV12;\n-\t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n+\t\t\tsize.width = std::min(sensorResolution.width,\n+\t\t\t\t\t IPU3_OUTPUT_MAX_WIDTH);\n+\t\t\tsize.height = std::min(sensorResolution.height,\n+\t\t\t\t\t IPU3_OUTPUT_MAX_HEIGHT);\n+\t\t\tsize.width &= ~IPU3_OUTPUT_WIDTH_ALIGN;\n+\t\t\tsize.height &= ~IPU3_OUTPUT_HEIGHT_ALIGN;\n+\t\t\tpixelFormat = formats::NV12;\n+\t\t\tbufferCount = IPU3_BUFFER_COUNT;\n+\t\t\tstreamFormats[pixelFormat] = { { minIPU3OutputSize, size } };\n \n \t\t\tbreak;\n \n \t\tcase StreamRole::StillCaptureRaw: {\n-\t\t\tcfg = data->cio2_.generateConfiguration(sensorResolution);\n-\t\t\tcfg.bufferCount = 1;\n+\t\t\tStreamConfiguration cio2Config =\n+\t\t\t\tdata->cio2_.generateConfiguration(sensorResolution);\n+\t\t\tpixelFormat = cio2Config.pixelFormat;\n+\t\t\tsize = cio2Config.size;\n+\t\t\tbufferCount = cio2Config.bufferCount;\n+\n+\t\t\tfor (const PixelFormat &format : data->cio2_.formats())\n+\t\t\t\tstreamFormats[format] = data->cio2_.sizes();\n \n \t\t\tbreak;\n \t\t}\n@@ -339,12 +349,13 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\t * sensor resolution and aligned to the ImgU output\n \t\t\t * constraints.\n \t\t\t */\n-\t\t\tcfg.size.width = std::min(1280U, sensorResolution.width);\n-\t\t\tcfg.size.height = std::min(720U, sensorResolution.height);\n-\t\t\tcfg.size.width &= ~IPU3_OUTPUT_WIDTH_ALIGN;\n-\t\t\tcfg.size.height &= ~IPU3_OUTPUT_HEIGHT_ALIGN;\n-\t\t\tcfg.pixelFormat = formats::NV12;\n-\t\t\tcfg.bufferCount = IPU3_BUFFER_COUNT;\n+\t\t\tsize.width = std::min(1280U, sensorResolution.width);\n+\t\t\tsize.height = std::min(720U, sensorResolution.height);\n+\t\t\tsize.width &= ~IPU3_OUTPUT_WIDTH_ALIGN;\n+\t\t\tsize.height &= ~IPU3_OUTPUT_HEIGHT_ALIGN;\n+\t\t\tpixelFormat = formats::NV12;\n+\t\t\tbufferCount = IPU3_BUFFER_COUNT;\n+\t\t\tstreamFormats[pixelFormat] = { { minIPU3OutputSize, size } };\n \n \t\t\tbreak;\n \t\t}\n@@ -356,6 +367,11 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \t\t\treturn nullptr;\n \t\t}\n \n+\t\tStreamFormats formats(streamFormats);\n+\t\tStreamConfiguration cfg(formats);\n+\t\tcfg.size = size;\n+\t\tcfg.pixelFormat = pixelFormat;\n+\t\tcfg.bufferCount = bufferCount;\n \t\tconfig->addConfiguration(cfg);\n \t}\n \n", "prefixes": [ "libcamera-devel", "v2", "06/20" ] }