[{"id":30217,"web_url":"https://patchwork.libcamera.org/comment/30217/","msgid":"","date":"2024-07-02T13:12:26","subject":"Re: [PATCH v4 3/5] libcamera: rkisp1: Prepare for additional camera\n\tcontrols","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Thu, Jun 27, 2024 at 07:16:54PM +0530, Umang Jain wrote:\n> Currently the rkisp1 pipeline handler only registers controls that are\n> related to the IPA. This patch prepares the rkisp1 pipeline-handler to\n> register camera controls which are not related to the IPA.\n> \n> Hence, introduce a additional ControlInfoMap for IPA controls. These\n> controls will be merged together with the controls in the pipeline\n> handler (introduced subsequently) as part of updateControls() and\n> together will be registered during the registration of the camera.\n> This is similar to what IPU3 pipeline handler handles its controls.\n> \n> Signed-off-by: Umang Jain \n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 28 +++++++++++++++++++++---\n> 1 file changed, 25 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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_;\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 isp_;\n> \tstd::unique_ptr 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 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 streams{\n> \t\t&data->mainPathStream_,\n> \t\t&data->selfPathStream_,\n> -- \n> 2.44.0\n>","headers":{"Return-Path":"","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 61CC9BEFBE\n\tfor ;\n\tTue, 2 Jul 2024 13:12:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EA7762E01;\n\tTue, 2 Jul 2024 15:12:34 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 30F6B62C96\n\tfor ;\n\tTue, 2 Jul 2024 15:12:33 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B9A03664;\n\tTue, 2 Jul 2024 15:12:04 +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=\"vGWKOJgM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719925925;\n\tbh=iu41Sqjhi8UFh5UoQG9XSbKEdKD9fjn1zUmUamWrhkw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=vGWKOJgMJxT0X6b483ELviEPZFoLUs4msDANr6dHmqIUuRLsz307KijikyCLTHRkS\n\tNleQoRpPz1Xrig5fXectVRO6xH75n1w+CFk/EQbmoRtPfU3x5Reu++Kg8EBP1vFk2p\n\t/wqtrCAcEZLi/rJVE0RGRiC1KyGhEnYcrXrD893Q=","Date":"Tue, 2 Jul 2024 22:12:26 +0900","From":"Paul Elder ","To":"Umang Jain ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v4 3/5] libcamera: rkisp1: Prepare for additional camera\n\tcontrols","Message-ID":"","References":"<20240627134656.582462-1-umang.jain@ideasonboard.com>\n\t<20240627134656.582462-4-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240627134656.582462-4-umang.jain@ideasonboard.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]