Patch Detail
Show a patch.
GET /api/patches/20433/?format=api
{ "id": 20433, "url": "https://patchwork.libcamera.org/api/patches/20433/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20433/", "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": "<20240627134656.582462-4-umang.jain@ideasonboard.com>", "date": "2024-06-27T13:46:54", "name": "[v4,3/5] libcamera: rkisp1: Prepare for additional camera controls", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7ca5e08a9417b765dd8dae60649b3d55cceee7ac", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20433/mbox/", "series": [ { "id": 4425, "url": "https://patchwork.libcamera.org/api/series/4425/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4425", "date": "2024-06-27T13:46:51", "name": "libcamera: rkisp1: Plumb the ConverterDW100 converter", "version": 4, "mbox": "https://patchwork.libcamera.org/series/4425/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20433/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20433/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 A13E8BDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 Jun 2024 13:47:11 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 82F9462E1D;\n\tThu, 27 Jun 2024 15:47:10 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ABF2D62C95\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Jun 2024 15:47:06 +0200 (CEST)", "from fedora.local (unknown\n\t[IPv6:2405:201:2015:f873:c173:4b:4a04:3a21])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1F795593;\n\tThu, 27 Jun 2024 15:46:41 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"oCnrbBkg\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719496002;\n\tbh=2+kYukOip1BdN6eD6IxERRI+4LAeFi+tEqRISU70gFY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=oCnrbBkgYQ28R9edCctr+JT2gkINKiVlGLwYj4yFc0kwQx6W5/KBXUlXgERForN52\n\tkes83uz8hhU7ISQwJzhIZTiHdDORL6GwIIJUQdtKIaFkOnEQy3razum8XmrQpA5M4d\n\tMDHjiiB2mKrsinfikm4KD6Kqe13opjk4lHYFE/3E=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Umang Jain <umang.jain@ideasonboard.com>", "Subject": "[PATCH v4 3/5] libcamera: rkisp1: Prepare for additional camera\n\tcontrols", "Date": "Thu, 27 Jun 2024 19:16:54 +0530", "Message-ID": "<20240627134656.582462-4-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.44.0", "In-Reply-To": "<20240627134656.582462-1-umang.jain@ideasonboard.com>", "References": "<20240627134656.582462-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Currently the rkisp1 pipeline handler only registers controls that are\nrelated to the IPA. This patch prepares the rkisp1 pipeline-handler to\nregister camera controls which are not related to the IPA.\n\nHence, introduce a additional ControlInfoMap for IPA controls. These\ncontrols will be merged together with the controls in the pipeline\nhandler (introduced subsequently) as part of updateControls() and\ntogether will be registered during the registration of the camera.\nThis is similar to what IPU3 pipeline handler handles its controls.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 28 +++++++++++++++++++++---\n 1 file changed, 25 insertions(+), 3 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 4cbf105d..bfc44239 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -109,6 +109,8 @@ public:\n \n \tstd::unique_ptr<ipa::rkisp1::IPAProxyRkISP1> ipa_;\n \n+\tControlInfoMap ipaControls_;\n+\n private:\n \tvoid paramFilled(unsigned int frame);\n \tvoid setSensorControls(unsigned int frame,\n@@ -184,6 +186,8 @@ private:\n \tint allocateBuffers(Camera *camera);\n \tint freeBuffers(Camera *camera);\n \n+\tint updateControls(RkISP1CameraData *data);\n+\n \tMediaDevice *media_;\n \tstd::unique_ptr<V4L2Subdevice> isp_;\n \tstd::unique_ptr<V4L2VideoDevice> param_;\n@@ -370,7 +374,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \t}\n \n \tret = ipa_->init({ ipaTuningFile, sensor_->model() }, hwRevision,\n-\t\t\t sensorInfo, sensor_->controls(), &controlInfo_);\n+\t\t\t sensorInfo, sensor_->controls(), &ipaControls_);\n \tif (ret < 0) {\n \t\tLOG(RkISP1, Error) << \"IPA initialization failure\";\n \t\treturn ret;\n@@ -820,12 +824,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \n \tipaConfig.sensorControls = data->sensor_->controls();\n \n-\tret = data->ipa_->configure(ipaConfig, streamConfig, &data->controlInfo_);\n+\tret = data->ipa_->configure(ipaConfig, streamConfig, &data->ipaControls_);\n \tif (ret) {\n \t\tLOG(RkISP1, Error) << \"failed configuring IPA (\" << ret << \")\";\n \t\treturn ret;\n \t}\n-\treturn 0;\n+\n+\treturn updateControls(data);\n }\n \n int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, Stream *stream,\n@@ -1101,8 +1106,23 @@ int PipelineHandlerRkISP1::initLinks(Camera *camera,\n \treturn 0;\n }\n \n+int PipelineHandlerRkISP1::updateControls(RkISP1CameraData *data)\n+{\n+\tControlInfoMap::Map rkisp1Controls;\n+\n+\t/* Add the IPA registered controls to list of camera controls. */\n+\tfor (const auto &ipaControl : data->ipaControls_)\n+\t\trkisp1Controls[ipaControl.first] = ipaControl.second;\n+\n+\tdata->controlInfo_ = ControlInfoMap(std::move(rkisp1Controls),\n+\t\t\t\t\t controls::controls);\n+\n+\treturn 0;\n+}\n+\n int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n {\n+\tControlInfoMap::Map rkisp1Controls;\n \tint ret;\n \n \tstd::unique_ptr<RkISP1CameraData> data =\n@@ -1137,6 +1157,8 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tif (ret)\n \t\treturn ret;\n \n+\tupdateControls(data.get());\n+\n \tstd::set<Stream *> streams{\n \t\t&data->mainPathStream_,\n \t\t&data->selfPathStream_,\n", "prefixes": [ "v4", "3/5" ] }