{"id":17163,"url":"https://patchwork.libcamera.org/api/1.1/patches/17163/?format=json","web_url":"https://patchwork.libcamera.org/patch/17163/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220818094410.1671-9-jacopo@jmondi.org>","date":"2022-08-18T09:44:01","name":"[libcamera-devel,v3,08/17] libcamera: rkisp1: ipa: Rename ctrls_ to sensorCtrls_","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"01ba7160fffde701e2df629c1f3cafc4b7c9d1d6","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17163/mbox/","series":[{"id":3426,"url":"https://patchwork.libcamera.org/api/1.1/series/3426/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3426","date":"2022-08-18T09:43:53","name":"libcamera: Align IPU3 and RKISP1 interfaces","version":3,"mbox":"https://patchwork.libcamera.org/series/3426/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17163/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17163/checks/","tags":{},"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 8C55CC3272\n\tfor ;\n\tThu, 18 Aug 2022 09:44:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0227761FCA;\n\tThu, 18 Aug 2022 11:44:32 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 72BAF61FD1\n\tfor ;\n\tThu, 18 Aug 2022 11:44:30 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id AE81EFF802;\n\tThu, 18 Aug 2022 09:44:29 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660815873;\n\tbh=fA0FlM+oSCTVbwZk+ejZRazPtfyNEvfWK2UoVpk7Uig=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=wTzoHk671EB14oj41Kx68YyP/SLY+25VhpgZtNbwMPb9eCpar93QKpUDIICPp5Qrx\n\tzS9J4gzIzMsmvcRw1Hf0suFZNFXhWj/vBFCbMhr/3Z1omH69T6fh5dug0qHqPuqWBK\n\t2dyiqgh+b1oNAGSwdFUTR2d1lDMMeoT7/kE416kyJkaDbDuUifuINBKH2QUXw3Weh/\n\t4FmaKAmc9LKpx+qxFJJgSLEErQ4HHvSj8UEBiXEFJwYxmF22fCMxxF+SyoBEKtboAc\n\ti8v/Z6ZIwJGlxIHfOnJNbjEAPwGGOmh4GEl+BK24vFBlCbL1GpyT+NV9BoOAFSiDMg\n\tLKWE8eQtXaplw==","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 18 Aug 2022 11:44:01 +0200","Message-Id":"<20220818094410.1671-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.37.2","In-Reply-To":"<20220818094410.1671-1-jacopo@jmondi.org>","References":"<20220818094410.1671-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 08/17] 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":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Daniel Semkowicz \n\nAs additional controls will be added to the IPA (like lens), we want to\nhave more specific names for each ControlInfoMap.\n\nSigned-off-by: Daniel Semkowicz \nReviewed-by: Jacopo Mondi \nSigned-off-by: Jacopo Mondi \n---\n src/ipa/rkisp1/rkisp1.cpp | 14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 724b0ffb6ace..15d1a40fbb9a 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@@ -204,16 +204,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@@ -348,7 +348,7 @@ void IPARkISP1::setControls(unsigned int frame)\n \tuint32_t exposure = context_.activeState.agc.exposure;\n \tuint32_t gain = camHelper_->gainCode(context_.activeState.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 \n","prefixes":["libcamera-devel","v3","08/17"]}