Patch Detail
Show a patch.
GET /api/1.1/patches/8465/?format=api
{ "id": 8465, "url": "https://patchwork.libcamera.org/api/1.1/patches/8465/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8465/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200628001532.2685967-9-niklas.soderlund@ragnatech.se>", "date": "2020-06-28T00:15:27", "name": "[libcamera-devel,v2,08/13] libcamera: ipu3: imgu: Use specific functions to configure each sink", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b9d47160bccc61ecd553ebfb8bcc76378e25ec9c", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8465/mbox/", "series": [ { "id": 1048, "url": "https://patchwork.libcamera.org/api/1.1/series/1048/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1048", "date": "2020-06-28T00:15:19", "name": "libcamera: ipu3: Refactoring of ImgU", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1048/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8465/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8465/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 29076C2E6A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 28 Jun 2020 00:15:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0208960BDC;\n\tSun, 28 Jun 2020 02:15:57 +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 1EA1D609C8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 28 Jun 2020 02:15:52 +0200 (CEST)", "from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 71d348a9-b8d4-11ea-86ee-0050569116f7;\n\tSun, 28 Jun 2020 02:15:17 +0200 (CEST)" ], "X-Halon-ID": "71d348a9-b8d4-11ea-86ee-0050569116f7", "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": "Sun, 28 Jun 2020 02:15:27 +0200", "Message-Id": "<20200628001532.2685967-9-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200628001532.2685967-1-niklas.soderlund@ragnatech.se>", "References": "<20200628001532.2685967-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 08/13] libcamera: ipu3: imgu: Use\n\tspecific functions to configure each sink", "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": "When the IPU3 pipeline only provided streams to applications that came\nfrom the ImgU it made sense to have a generic function to configure all\nthe different outputs. With the addition of the RAW stream this begins\nto be cumbersome to read and make sense of in the PipelineHandlerIPU3\ncode. Replace the generic function that takes a specific argument for\nwhich sink to configure with a specific function for each sink.\n\nThis makes the code easier to follow as it's always clear which of the\nImgU sinks are being configured without knowing the content of a\ngenerically named variable. It also paves way for future improvements.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n* Changes since v1\n- s/sens/sense/\n- Retain comment for configureVideoDevice()\n- Inline the accessors for configureVideoDevice() in the .h file\n- Update comment in PipelineHandlerIPU3::configure()\n---\n src/libcamera/pipeline/ipu3/imgu.cpp | 20 +++++++--------\n src/libcamera/pipeline/ipu3/imgu.h | 28 ++++++++++++++++++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 38 +++++++++++++++-------------\n 3 files changed, 57 insertions(+), 29 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\nindex 46d56a5d18dc3687..981239cba975f92e 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.cpp\n+++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n@@ -139,18 +139,17 @@ int ImgUDevice::configureInput(const Size &size,\n }\n \n /**\n- * \\brief Configure the ImgU unit \\a id video output\n- * \\param[in] output The ImgU output device to configure\n+ * \\brief Configure a video device on the ImgU\n+ * \\param[in] dev The video device to configure\n+ * \\param[in] pad The pad of the ImgU subdevice\n * \\param[in] cfg The requested configuration\n+ * \\param[out] outputFormat The format set on the video device\n * \\return 0 on success or a negative error code otherwise\n */\n-int ImgUDevice::configureOutput(ImgUOutput *output,\n-\t\t\t\tconst StreamConfiguration &cfg,\n-\t\t\t\tV4L2DeviceFormat *outputFormat)\n+int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n+\t\t\t\t const StreamConfiguration &cfg,\n+\t\t\t\t V4L2DeviceFormat *outputFormat)\n {\n-\tV4L2VideoDevice *dev = output->dev;\n-\tunsigned int pad = output->pad;\n-\n \tV4L2SubdeviceFormat imguFormat = {};\n \timguFormat.mbus_code = MEDIA_BUS_FMT_FIXED;\n \timguFormat.size = cfg.size;\n@@ -160,7 +159,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n \t\treturn ret;\n \n \t/* No need to apply format to the stat node. */\n-\tif (output == &stat_)\n+\tif (dev == stat_.dev)\n \t\treturn 0;\n \n \t*outputFormat = {};\n@@ -172,7 +171,8 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n \tif (ret)\n \t\treturn ret;\n \n-\tLOG(IPU3, Debug) << \"ImgU \" << output->name << \" format = \"\n+\tconst char *name = dev == output_.dev ? \"output\" : \"viewfinder\";\n+\tLOG(IPU3, Debug) << \"ImgU \" << name << \" format = \"\n \t\t\t << outputFormat->toString();\n \n \treturn 0;\ndiff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\nindex b6b08b4fef2d3a9d..5f1dbfd8f45f7924 100644\n--- a/src/libcamera/pipeline/ipu3/imgu.h\n+++ b/src/libcamera/pipeline/ipu3/imgu.h\n@@ -49,9 +49,29 @@ public:\n \t}\n \n \tint init(MediaDevice *media, unsigned int index);\n+\n \tint configureInput(const Size &size, V4L2DeviceFormat *inputFormat);\n-\tint configureOutput(ImgUOutput *output, const StreamConfiguration &cfg,\n-\t\t\t V4L2DeviceFormat *outputFormat);\n+\n+\tint configureOutput(const StreamConfiguration &cfg,\n+\t\t\t V4L2DeviceFormat *outputFormat)\n+\t{\n+\t\treturn configureVideoDevice(output_.dev, PAD_OUTPUT, cfg,\n+\t\t\t\t\t outputFormat);\n+\t}\n+\n+\tint configureViewfinder(const StreamConfiguration &cfg,\n+\t\t\t\tV4L2DeviceFormat *outputFormat)\n+\t{\n+\t\treturn configureVideoDevice(viewfinder_.dev, PAD_VF, cfg,\n+\t\t\t\t\t outputFormat);\n+\t}\n+\n+\tint configureStat(const StreamConfiguration &cfg,\n+\t\t\t V4L2DeviceFormat *outputFormat)\n+\t{\n+\t\treturn configureVideoDevice(stat_.dev, PAD_STAT, cfg,\n+\t\t\t\t\t outputFormat);\n+\t}\n \n \tint allocateBuffers(unsigned int bufferCount);\n \tvoid freeBuffers();\n@@ -78,6 +98,10 @@ private:\n \t\t const std::string &sink, unsigned int sinkPad,\n \t\t bool enable);\n \n+\tint configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n+\t\t\t\t const StreamConfiguration &cfg,\n+\t\t\t\t V4L2DeviceFormat *outputFormat);\n+\n \tstd::string name_;\n \tMediaDevice *media_;\n };\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex b41a789e8dc2a7b2..e817f842f1216a7f 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -504,19 +504,25 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\tstream->active_ = true;\n \t\tcfg.setStream(stream);\n \n-\t\t/*\n-\t\t * The RAW still capture stream just copies buffers from the\n-\t\t * internal queue and doesn't need any specific configuration.\n-\t\t */\n-\t\tif (stream->raw_) {\n+\t\tif (stream == outStream) {\n+\t\t\tret = imgu->configureOutput(cfg, &outputFormat);\n+\t\t\tif (ret)\n+\t\t\t\treturn ret;\n+\n+\t\t\tcfg.stride = outputFormat.planes[0].bpl;\n+\t\t} else if (stream == vfStream) {\n+\t\t\tret = imgu->configureViewfinder(cfg, &outputFormat);\n+\t\t\tif (ret)\n+\t\t\t\treturn ret;\n+\n+\t\t\tcfg.stride = outputFormat.planes[0].bpl;\n+\t\t} else {\n+\t\t\t/*\n+\t\t\t * The RAW still capture stream only uses en externel\n+\t\t\t * for the already configured CIO2 sink and doesn't need\n+\t\t\t * any specific configuration of the ImgU.\n+\t\t\t */\n \t\t\tcfg.stride = cio2Format.planes[0].bpl;\n-\t\t} else {\n-\t\t\tret = imgu->configureOutput(stream->device_, cfg,\n-\t\t\t\t\t\t &outputFormat);\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n-\n-\t\t\tcfg.stride = outputFormat.planes[0].bpl;\n \t\t}\n \t}\n \n@@ -526,15 +532,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * be at least one active stream in the configuration request).\n \t */\n \tif (!outStream->active_) {\n-\t\tret = imgu->configureOutput(outStream->device_, config->at(0),\n-\t\t\t\t\t &outputFormat);\n+\t\tret = imgu->configureOutput(config->at(0), &outputFormat);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n \n \tif (!vfStream->active_) {\n-\t\tret = imgu->configureOutput(vfStream->device_, config->at(0),\n-\t\t\t\t\t &outputFormat);\n+\t\tret = imgu->configureViewfinder(config->at(0), &outputFormat);\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n@@ -546,7 +550,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tStreamConfiguration statCfg = {};\n \tstatCfg.size = cio2Format.size;\n \n-\tret = imgu->configureOutput(&imgu->stat_, statCfg, &outputFormat);\n+\tret = imgu->configureStat(statCfg, &outputFormat);\n \tif (ret)\n \t\treturn ret;\n \n", "prefixes": [ "libcamera-devel", "v2", "08/13" ] }