[{"id":22241,"web_url":"https://patchwork.libcamera.org/comment/22241/","msgid":"","date":"2022-03-09T15:15:50","subject":"Re: [libcamera-devel] [PATCH v5 7/9] libcamera: ipa: Rename ctrls_\n\tmember","submitter":{"id":97,"url":"https://patchwork.libcamera.org/api/people/97/","name":"Nicolas Dufresne via libcamera-devel","email":"libcamera-devel@lists.libcamera.org"},"content":"Hi !\n\nThanks for the patch !\n\nOn 04/03/2022 00:49, Daniel Scally wrote:\n> Now that we have added lens controls, rename the existiing\ns/existiing/existing\n\n> member of the class to clarify that it relates to the sensor's\n> controls.\n> \n> Reviewed-by: Laurent Pinchart \n> Signed-off-by: Daniel Scally \n\nWith the small typo corrected (can be done when applying):\nReviewed-by: Jean-Michel Hautbois \n\n> ---\n> Changes in v5:\n> \n> \t- None\n> \n> Changes since v4:\n> \n> \t- None\n> \n> Changes in v3:\n> \n> \t- New patch\n> \n> src/ipa/ipu3/ipu3.cpp | 22 +++++++++++-----------\n> 1 file changed, 11 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 008f93a7..e539d875 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -162,7 +162,7 @@ private:\n> \n> \tstd::map buffers_;\n> \n> -\tControlInfoMap ctrls_;\n> +\tControlInfoMap sensorCtrls_;\n> \tControlInfoMap lensCtrls_;\n> \n> \tIPACameraSensorInfo sensorInfo_;\n> @@ -457,22 +457,22 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n> \t * Compute the sensor V4L2 controls to be used by the algorithms and\n> \t * to be set on the sensor.\n> \t */\n> -\tctrls_ = configInfo.sensorControls;\n> +\tsensorCtrls_ = configInfo.sensorControls;\n> \n> -\tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n> -\tif (itExp == ctrls_.end()) {\n> +\tconst auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE);\n> +\tif (itExp == sensorCtrls_.end()) {\n> \t\tLOG(IPAIPU3, Error) << \"Can't find exposure control\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\tconst auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> -\tif (itGain == ctrls_.end()) {\n> +\tconst auto itGain = sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> +\tif (itGain == sensorCtrls_.end()) {\n> \t\tLOG(IPAIPU3, Error) << \"Can't find gain control\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\tconst auto itVBlank = ctrls_.find(V4L2_CID_VBLANK);\n> -\tif (itVBlank == ctrls_.end()) {\n> +\tconst auto itVBlank = sensorCtrls_.find(V4L2_CID_VBLANK);\n> +\tif (itVBlank == sensorCtrls_.end()) {\n> \t\tLOG(IPAIPU3, Error) << \"Can't find VBLANK control\";\n> \t\treturn -EINVAL;\n> \t}\n> @@ -497,10 +497,10 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n> \tinitAfGrid(configInfo.bdsOutputSize);\n> \n> \t/* Update the camera controls using the new sensor settings. */\n> -\tupdateControls(sensorInfo_, ctrls_, ipaControls);\n> +\tupdateControls(sensorInfo_, sensorCtrls_, ipaControls);\n> \n> \t/* Update the IPASessionConfiguration using the sensor settings. */\n> -\tupdateSessionConfiguration(ctrls_);\n> +\tupdateSessionConfiguration(sensorCtrls_);\n> \n> \tfor (auto const &algo : algorithms_) {\n> \t\tint ret = algo->configure(context_, configInfo);\n> @@ -699,7 +699,7 @@ void IPAIPU3::setControls(unsigned int frame)\n> \texposure_ = context_.frameContext.agc.exposure;\n> \tgain_ = camHelper_->gainCode(context_.frameContext.agc.gain);\n> \n> -\tControlList ctrls(ctrls_);\n> +\tControlList ctrls(sensorCtrls_);\n> \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_));\n> \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain_));\n> \top.sensorControls = ctrls;","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 48646BF415\n\tfor ;\n\tWed, 9 Mar 2022 15:15:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 036D561189;\n\tWed, 9 Mar 2022 16:15:55 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CA55260475\n\tfor ;\n\tWed, 9 Mar 2022 16:15:52 +0100 (CET)","from [IPV6:2a01:e0a:169:7140:3734:287e:1a7f:9772] (unknown\n\t[IPv6:2a01:e0a:169:7140:3734:287e:1a7f:9772])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8BED68C4;\n\tWed, 9 Mar 2022 16:15:52 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1646838955;\n\tbh=dDKIMBCMwlSiPvTSyGiDKHbu0m5hUeqC4NA1HH23+rw=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=i4AvKK/jz36lCWSGtq3WBOB+OdUdPOSGiekuYejssngjVZ/hJHZuCMLL7DmMmLrIu\n\tdsG5vwYP3KjQ45Ns5VD4SyD+DAb/LiF0KjuvsmjISr1zjTm7LI44WMiYYkCRSw/m3l\n\t9DG+ux0W8x9orEBu3sVh49VUPmdxUWOGsNsuaC16nJQxnMAPKXnDucLpmsrJ2vQyg2\n\tQ7d/M273SgKTdrxW8AHrBNesHKVfPP0B1KMXIuq6Gzy580f0b1vLErSRkOrIVjkOhz\n\tv1nnHDf8o5q16GmqwXF2pzwM7A7yB4UIrIsh9K92hxTd7ITC3/XiHlERQEEhNDfHYN\n\tp9A9drGDaHYxQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1646838952;\n\tbh=dDKIMBCMwlSiPvTSyGiDKHbu0m5hUeqC4NA1HH23+rw=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=jWdKlbZ+kKePEiHTz/MrdSfRY/ndDAkTpscfPhUw16XIZjTPxR+LM6c/Hh/Byx6LU\n\t/sF79eGcafBIRDrzLzgy9n03YqnutBCuoYFvxcelG9uqJbyPJaydCavbAA1qo2iwpY\n\tynJl6x4G8gkncoRNN9CY4phn6kSMNin2tB4GKOb4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"jWdKlbZ+\"; dkim-atps=neutral","Message-ID":"","Date":"Wed, 9 Mar 2022 16:15:50 +0100","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.5.0","Content-Language":"en-US","To":"Daniel Scally , libcamera-devel@lists.libcamera.org","References":"<20220303234956.1463551-1-djrscally@gmail.com>\n\t<20220303234956.1463551-8-djrscally@gmail.com>","In-Reply-To":"<20220303234956.1463551-8-djrscally@gmail.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v5 7/9] libcamera: ipa: Rename ctrls_\n\tmember","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","From":"Jean-Michel Hautbois via libcamera-devel\n\t","Reply-To":"Jean-Michel Hautbois ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]