Patch Detail
Show a patch.
GET /api/patches/11293/?format=api
{ "id": 11293, "url": "https://patchwork.libcamera.org/api/patches/11293/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11293/", "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": "<20210215093843.144886-1-paul.elder@ideasonboard.com>", "date": "2021-02-15T09:38:43", "name": "[libcamera-devel,v2] libcamera: pipeline: rkisp1: configure IPA from configure method instead of start method", "commit_ref": "a119d755302c9435cc24f345fdb694c8f14a5957", "pull_url": null, "state": "accepted", "archived": false, "hash": "683101c4b12bd60d534355d0dd7e49242fc61f3d", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11293/mbox/", "series": [ { "id": 1692, "url": "https://patchwork.libcamera.org/api/series/1692/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1692", "date": "2021-02-15T09:38:43", "name": "[libcamera-devel,v2] libcamera: pipeline: rkisp1: configure IPA from configure method instead of start method", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1692/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11293/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11293/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 1AA94BD160\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Feb 2021 09:38:56 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90C71637BB;\n\tMon, 15 Feb 2021 10:38:55 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 55CBC6375F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Feb 2021 10:38:53 +0100 (CET)", "from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 45DAD743;\n\tMon, 15 Feb 2021 10:38:51 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"PkoxBdnl\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613381932;\n\tbh=g++3CiYVM6cvC1AV2v6Yn+Pt/3jS1dRD5YxG883nZ/E=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=PkoxBdnlfxVGw/t1jto6T+vlIHQ3MockLu34p9b0AviujK9jG37S8nLttOzPsmC+B\n\tbOA+S6vBcY2kPkqjh2SYgKPT7LeWh5bt+Z+kvFaYdZbsG0zJuXRQcXyJlPYzspr3hQ\n\thih73woqIpdEHSn+ziwwQy6L4WJ5V8bhBHMQDKv8=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 15 Feb 2021 18:38:43 +0900", "Message-Id": "<20210215093843.144886-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2] libcamera: pipeline: rkisp1: configure\n\tIPA from configure method instead of start method", "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": "From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>\n\nCurrently the call to the configure method of rkisp1 IPA\nis called upon the 'start' of the pipeline. This should be done\nin the 'configure' method instead.\n\n[Original patch]\nSigned-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n[v2]\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nHi Dafna,\n\nThe IPA IPC series is ready to be merged but depends on this patch, so\nI've taken the liberty to send a v2 to speed things up.\n\nChanges in v2:\n- remove path isEnabled() checks from configure()\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 62 ++++++++++++------------\n 1 file changed, 30 insertions(+), 32 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex e85979a7..7cb89eb0 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -607,11 +607,22 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\t<< \"ISP output pad configured with \" << format.toString()\n \t\t<< \" crop \" << rect.toString();\n \n+\tstd::map<unsigned int, IPAStream> streamConfig;\n+\n \tfor (const StreamConfiguration &cfg : *config) {\n-\t\tif (cfg.stream() == &data->mainPathStream_)\n+\t\tif (cfg.stream() == &data->mainPathStream_) {\n \t\t\tret = mainPath_.configure(cfg, format);\n-\t\telse\n+\t\t\tstreamConfig[0] = {\n+\t\t\t\t.pixelFormat = cfg.pixelFormat,\n+\t\t\t\t.size = cfg.size,\n+\t\t\t};\n+\t\t} else {\n \t\t\tret = selfPath_.configure(cfg, format);\n+\t\t\tstreamConfig[1] = {\n+\t\t\t\t.pixelFormat = cfg.pixelFormat,\n+\t\t\t\t.size = cfg.size,\n+\t\t\t};\n+\t\t}\n \n \t\tif (ret)\n \t\t\treturn ret;\n@@ -629,6 +640,23 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tif (ret)\n \t\treturn ret;\n \n+\t/* Inform IPA of stream configuration and sensor controls. */\n+\tCameraSensorInfo sensorInfo = {};\n+\tret = data->sensor_->sensorInfo(&sensorInfo);\n+\tif (ret) {\n+\t\t/* \\todo Turn this into a hard failure. */\n+\t\tLOG(RkISP1, Warning) << \"Camera sensor information not available\";\n+\t\tsensorInfo = {};\n+\t\tret = 0;\n+\t}\n+\n+\tstd::map<unsigned int, const ControlInfoMap &> entityControls;\n+\tentityControls.emplace(0, data->sensor_->controls());\n+\n+\tIPAOperationData ipaConfig;\n+\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls,\n+\t\t\t ipaConfig, nullptr);\n+\n \treturn 0;\n }\n \n@@ -759,8 +787,6 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\treturn ret;\n \t}\n \n-\tstd::map<unsigned int, IPAStream> streamConfig;\n-\n \tif (data->mainPath_->isEnabled()) {\n \t\tret = mainPath_.start();\n \t\tif (ret) {\n@@ -770,11 +796,6 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\t\tfreeBuffers(camera);\n \t\t\treturn ret;\n \t\t}\n-\n-\t\tstreamConfig[0] = {\n-\t\t\t.pixelFormat = data->mainPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->mainPathStream_.configuration().size,\n-\t\t};\n \t}\n \n \tif (data->selfPath_->isEnabled()) {\n@@ -787,34 +808,11 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] ControlList *c\n \t\t\tfreeBuffers(camera);\n \t\t\treturn ret;\n \t\t}\n-\n-\t\tstreamConfig[1] = {\n-\t\t\t.pixelFormat = data->selfPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->selfPathStream_.configuration().size,\n-\t\t};\n \t}\n \n \tisp_->setFrameStartEnabled(true);\n \n \tactiveCamera_ = camera;\n-\n-\t/* Inform IPA of stream configuration and sensor controls. */\n-\tCameraSensorInfo sensorInfo = {};\n-\tret = data->sensor_->sensorInfo(&sensorInfo);\n-\tif (ret) {\n-\t\t/* \\todo Turn this in an hard failure. */\n-\t\tLOG(RkISP1, Warning) << \"Camera sensor information not available\";\n-\t\tsensorInfo = {};\n-\t\tret = 0;\n-\t}\n-\n-\tstd::map<unsigned int, const ControlInfoMap &> entityControls;\n-\tentityControls.emplace(0, data->sensor_->controls());\n-\n-\tIPAOperationData ipaConfig;\n-\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls,\n-\t\t\t ipaConfig, nullptr);\n-\n \treturn ret;\n }\n \n", "prefixes": [ "libcamera-devel", "v2" ] }