Patch Detail
Show a patch.
GET /api/patches/8468/?format=api
{ "id": 8468, "url": "https://patchwork.libcamera.org/api/patches/8468/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8468/", "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": "<20200628001532.2685967-11-niklas.soderlund@ragnatech.se>", "date": "2020-06-28T00:15:29", "name": "[libcamera-devel,v2,10/13] libcamera: ipu3: Remove the active flag from IPU3Stream", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2d609ee4fa42b7ecfa995cb7954b7ffaddc57339", "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/8468/mbox/", "series": [ { "id": 1048, "url": "https://patchwork.libcamera.org/api/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/8468/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8468/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 BB1C5C2E69\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 28 Jun 2020 00:15:58 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7D35B60B02;\n\tSun, 28 Jun 2020 02:15:58 +0200 (CEST)", "from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C35B60B08\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 28 Jun 2020 02:15:54 +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 72bc0497-b8d4-11ea-86ee-0050569116f7;\n\tSun, 28 Jun 2020 02:15:18 +0200 (CEST)" ], "X-Halon-ID": "72bc0497-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:29 +0200", "Message-Id": "<20200628001532.2685967-11-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 10/13] libcamera: ipu3: Remove the\n\tactive flag from IPU3Stream", "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 active_ flag is only used inside one function, remove the global\nflag and handle it inside the single function.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 20 +++++++-------------\n 1 file changed, 7 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c1520ec40fe7b57c..332cbbded52497f7 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -33,13 +33,6 @@ LOG_DEFINE_CATEGORY(IPU3)\n \n class IPU3Stream : public Stream\n {\n-public:\n-\tIPU3Stream()\n-\t\t: active_(false)\n-\t{\n-\t}\n-\n-\tbool active_;\n };\n \n class IPU3CameraData : public CameraData\n@@ -486,8 +479,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \t/* Apply the format to the configured streams output devices. */\n-\toutStream->active_ = false;\n-\tvfStream->active_ = false;\n+\tbool outActive = false;\n+\tbool vfActive = false;\n \n \tfor (unsigned int i = 0; i < config->size(); ++i) {\n \t\t/*\n@@ -499,7 +492,6 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\tIPU3Stream *stream = const_cast<IPU3Stream *>(config->streams()[i]);\n \t\tStreamConfiguration &cfg = (*config)[i];\n \n-\t\tstream->active_ = true;\n \t\tcfg.setStream(stream);\n \n \t\tif (stream == outStream) {\n@@ -508,12 +500,14 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\t\t\treturn ret;\n \n \t\t\tcfg.stride = outputFormat.planes[0].bpl;\n+\t\t\toutActive = true;\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\tvfActive = true;\n \t\t} else {\n \t\t\t/*\n \t\t\t * The RAW still capture stream only uses en externel\n@@ -529,13 +523,13 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t * the configuration of the active one for that purpose (there should\n \t * be at least one active stream in the configuration request).\n \t */\n-\tif (!outStream->active_) {\n+\tif (!outActive) {\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+\tif (!vfActive) {\n \t\tret = imgu->configureViewfinder(config->at(0), &outputFormat);\n \t\tif (ret)\n \t\t\treturn ret;\n@@ -555,7 +549,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t/* Apply the \"pipe_mode\" control to the ImgU subdevice. */\n \tControlList ctrls(imgu->imgu_->controls());\n \tctrls.set(V4L2_CID_IPU3_PIPE_MODE,\n-\t\t static_cast<int32_t>(vfStream->active_ ? IPU3PipeModeVideo :\n+\t\t static_cast<int32_t>(vfActive ? IPU3PipeModeVideo :\n \t\t\t\t IPU3PipeModeStillCapture));\n \tret = imgu->imgu_->setControls(&ctrls);\n \tif (ret) {\n", "prefixes": [ "libcamera-devel", "v2", "10/13" ] }