[{"id":24482,"web_url":"https://patchwork.libcamera.org/comment/24482/","msgid":"","date":"2022-08-09T15:39:24","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: rkisp1: ipa: Rename\n\tctrls_ to sensorCtrls_","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Daniel,\n\nThank you for the patch.\n\nOn Tue, Aug 09, 2022 at 04:47:02PM +0200, Daniel Semkowicz via libcamera-devel wrote:\n> As additional controls will be added to the IPA (like lens), we want to\n> have more specific names for each ControlInfoMap.\n> \n> Signed-off-by: Daniel Semkowicz \n> Reviewed-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/rkisp1/rkisp1.cpp | 14 +++++++-------\n> 1 file changed, 7 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 17d42d38..ee484845 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -69,7 +69,7 @@ private:\n> \tstd::map buffers_;\n> \tstd::map mappedBuffers_;\n> \n> -\tControlInfoMap ctrls_;\n> +\tControlInfoMap sensorCtrls_;\n> \n> \t/* Camera sensor controls. */\n> \tbool autoExposure_;\n> @@ -199,16 +199,16 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> \tif (entityControls.empty())\n> \t\treturn -EINVAL;\n> \n> -\tctrls_ = entityControls.at(0);\n> +\tsensorCtrls_ = entityControls.at(0);\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(IPARkISP1, 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(IPARkISP1, Error) << \"Can't find gain control\";\n> \t\treturn -EINVAL;\n> \t}\n> @@ -336,7 +336,7 @@ void IPARkISP1::setControls(unsigned int frame)\n> \tuint32_t exposure = context_.frameContext.agc.exposure;\n> \tuint32_t gain = 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>","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 A2DE1C3272\n\tfor ;\n\tTue, 9 Aug 2022 15:39:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1149C6332B;\n\tTue, 9 Aug 2022 17:39:39 +0200 (CEST)","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 DD4E161FAA\n\tfor ;\n\tTue, 9 Aug 2022 17:39:37 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3B65D481;\n\tTue, 9 Aug 2022 17:39:37 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660059579;\n\tbh=U3cT0EVIuI1oQ6SRxvnUrmQseuA/jw3j8x6VnuTpmj0=;\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:Cc:\n\tFrom;\n\tb=wZ0bbb1/iDgdx1gbcBxQoi7doNR/DuR5eUlyygbTxAaYqj7eTdq5Qjlongj3myNR4\n\tjxh4gB97azfz6L63kGAv/tIX0COr6Eh+JOqbugbUkd3yx6gABJos30ofkGzjahcaUY\n\t38ZnKHa1AjJvrp+Ri9w5RxnB7rNK13XNP/BrKWUKn1MRvvy877q1twge5CUhrp6pCm\n\t5ujXn7kykKbWFpu2LazTvpeYt72ewN27JxGpUjai6IqWJESJLJOJlAa5XpGx1zYgvS\n\tUKHOwpNk9HYjT72uV2TiLOoQ9M7+8p5UXwyuYKtPl3LO2vbJNVLcXMzh+vgYXnj8sG\n\tyXneZUldx61/Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660059577;\n\tbh=U3cT0EVIuI1oQ6SRxvnUrmQseuA/jw3j8x6VnuTpmj0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=V4fNYBQ8Bq871rNhjo7Y++zikUFoR0pCvjtfrZHgxsdyaZgIFvgihEj3LkptFE3L1\n\tE5UxSDvQ9fpWSvXXq8GqLrtjpd88GG430c6F8x2obwwNkRQ+XAOf18HK8pcGsCZEP/\n\tIUD05tq9YFu6A6r7KPLGwQrr5NedC1Xs/f+gK8dE="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"V4fNYBQ8\"; dkim-atps=neutral","Date":"Tue, 9 Aug 2022 18:39:24 +0300","To":"Daniel Semkowicz ","Message-ID":"","References":"<20220809144704.61682-1-dse@thaumatec.com>\n\t<20220809144704.61682-2-dse@thaumatec.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220809144704.61682-2-dse@thaumatec.com>","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: rkisp1: ipa: Rename\n\tctrls_ to sensorCtrls_","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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":24483,"web_url":"https://patchwork.libcamera.org/comment/24483/","msgid":"<166005960059.15821.11129483170817758503@Monstersaurus>","date":"2022-08-09T15:40:00","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: rkisp1: ipa: Rename\n\tctrls_ to sensorCtrls_","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Daniel Semkowicz via libcamera-devel (2022-08-09 15:47:02)\n> As additional controls will be added to the IPA (like lens), we want to\n> have more specific names for each ControlInfoMap.\n> \n> Signed-off-by: Daniel Semkowicz \n> Reviewed-by: Jacopo Mondi \n\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/rkisp1/rkisp1.cpp | 14 +++++++-------\n> 1 file changed, 7 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 17d42d38..ee484845 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -69,7 +69,7 @@ private:\n> std::map buffers_;\n> std::map mappedBuffers_;\n> \n> - ControlInfoMap ctrls_;\n> + ControlInfoMap sensorCtrls_;\n> \n> /* Camera sensor controls. */\n> bool autoExposure_;\n> @@ -199,16 +199,16 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n> if (entityControls.empty())\n> return -EINVAL;\n> \n> - ctrls_ = entityControls.at(0);\n> + sensorCtrls_ = entityControls.at(0);\n> \n> - const auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n> - if (itExp == ctrls_.end()) {\n> + const auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE);\n> + if (itExp == sensorCtrls_.end()) {\n> LOG(IPARkISP1, Error) << \"Can't find exposure control\";\n> return -EINVAL;\n> }\n> \n> - const auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> - if (itGain == ctrls_.end()) {\n> + const auto itGain = sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> + if (itGain == sensorCtrls_.end()) {\n> LOG(IPARkISP1, Error) << \"Can't find gain control\";\n> return -EINVAL;\n> }\n> @@ -336,7 +336,7 @@ void IPARkISP1::setControls(unsigned int frame)\n> uint32_t exposure = context_.frameContext.agc.exposure;\n> uint32_t gain = camHelper_->gainCode(context_.frameContext.agc.gain);\n> \n> - ControlList ctrls(ctrls_);\n> + ControlList ctrls(sensorCtrls_);\n> ctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure));\n> ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain));\n> \n> -- \n> 2.34.1\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 C0DC7C3272\n\tfor ;\n\tTue, 9 Aug 2022 15:40:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8A7066332B;\n\tTue, 9 Aug 2022 17:40:04 +0200 (CEST)","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 E41F061FAA\n\tfor ;\n\tTue, 9 Aug 2022 17:40:02 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 93AF9481;\n\tTue, 9 Aug 2022 17:40:02 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660059604;\n\tbh=Vppd7MTwG0v0jdWIDVrb/JbffMtVdfndzJ6J0noXyd0=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=oQOnwbgzyc7DVHiUrH4I8OUAhr1ob3BA2hDDRobA7gJQnpfi8gMG4cdFLKhkgApM1\n\tyZj468WL6/u6q8gSP/FTwodrvSw5WutfjgE00WxvlUXr0NLILdNUbfTiJrbjfq/Ots\n\tTWetcM47E8R3bBjuEO+P05wMEUrSOlWESHyTh+yjoqil1pfij/zdS0kmN8Cy7qApky\n\tten0l1ZGfYEEy+753ov9nlLTjWrCOS70YHeKckXj2a925GbvRr7mDwom9ud3Fyad0w\n\tEXICo5HTnKJ2/Ijhd0raxoi3mX9KOCr9EVZtIHMgGiMEIUAt5RPg+QQJUmgeO61zcG\n\tvmVywXkJ/TzlA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660059602;\n\tbh=Vppd7MTwG0v0jdWIDVrb/JbffMtVdfndzJ6J0noXyd0=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=cNDs5pCwIDXc1y2e3yZGVJSHPpQtax5C8DPlROW6kQdpHqJatK3Wb+Cplm58tDpo1\n\t/mbsdjJIoIoEU+anF6XMCpNjT8ZE7SVrmfPgoLdbXGE7ghOFgDrnK6wAU0isNylHkH\n\tmLb1k54rxWfxbInnikWe8kqtC6uwDJI8B4HwWwh0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"cNDs5pCw\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20220809144704.61682-2-dse@thaumatec.com>","References":"<20220809144704.61682-1-dse@thaumatec.com>\n\t<20220809144704.61682-2-dse@thaumatec.com>","To":"Daniel Semkowicz , libcamera-devel@lists.libcamera.org","Date":"Tue, 09 Aug 2022 16:40:00 +0100","Message-ID":"<166005960059.15821.11129483170817758503@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: rkisp1: ipa: Rename\n\tctrls_ to sensorCtrls_","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":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]