{"id":15414,"url":"https://patchwork.libcamera.org/api/1.1/patches/15414/?format=json","web_url":"https://patchwork.libcamera.org/patch/15414/","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":"<20220303234956.1463551-8-djrscally@gmail.com>","date":"2022-03-03T23:49:54","name":"[libcamera-devel,v5,7/9] libcamera: ipa: Rename ctrls_ member","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"470e610e199e0430334508c82c9e3beaf81c580a","submitter":{"id":90,"url":"https://patchwork.libcamera.org/api/1.1/people/90/?format=json","name":"Daniel Scally","email":"djrscally@gmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15414/mbox/","series":[{"id":2950,"url":"https://patchwork.libcamera.org/api/1.1/series/2950/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2950","date":"2022-03-03T23:49:47","name":"Enumerate CameraLens by following sensor's ancillary links","version":5,"mbox":"https://patchwork.libcamera.org/series/2950/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15414/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15414/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 A4162BE08A\n\tfor ;\n\tThu, 3 Mar 2022 23:50:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4B9FB6116E;\n\tFri, 4 Mar 2022 00:50:23 +0100 (CET)","from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n\t[IPv6:2a00:1450:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9318261184\n\tfor ;\n\tFri, 4 Mar 2022 00:50:17 +0100 (CET)","by mail-wm1-x333.google.com with SMTP id\n\tm42-20020a05600c3b2a00b00382ab337e14so5072104wms.3\n\tfor ;\n\tThu, 03 Mar 2022 15:50:17 -0800 (PST)","from localhost.localdomain\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161])\n\tby smtp.gmail.com with ESMTPSA id\n\ty4-20020adff144000000b001f022290737sm3079779wro.6.2022.03.03.15.50.16\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 03 Mar 2022 15:50:17 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"hElCWrVd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ddSe0HKy7Vddk2WXwI75i30bm3UafMYEjd1HK05iugs=;\n\tb=hElCWrVdQCzC1j9oFf7jSRC5rRqt+ttTCiGHHbMCaEcSibtDRYnTnWshQsJY/tVNSo\n\tqrbwyraLQHvZNqn+DpTuQbT4W+wGTwAd5jexcOMeJoOAAkuFV7nWfTWMD4Tg9GKuVID4\n\tEYGvH/BIQPVVmbwR/eEiCCTeFmAIpXOgwaxNOl91YwD3v/fw5coREjQ/VPn8dgVk+zpB\n\tDt/hveFPQCi5Q6DFQTBg+40fzroWpcun0PmmsR0cOmx02KWpZljGY/zGEei3V6tpbU3V\n\tMztpitE0tvBmWvnnr6ChLzKdNnDibYrNs/C0B/RJLqSf/TykxFrnFgD9RGup7cmZbM++\n\tW9EQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=ddSe0HKy7Vddk2WXwI75i30bm3UafMYEjd1HK05iugs=;\n\tb=epNu+OX1Ho5SvjLcmhK7yCOEqK9SuzE5ZolEomQXSMmbr57wDSnxkyd1545bqJB08o\n\t1BS+Bs1Ek/t3XV5NP3bQoIlz/I/X/OOFPHFxjqm4bx9CuwVyIuH7ocPQUaHT8GCfnIV7\n\tyI6WNVxlw3SOr7PqN7AUCvJV05oc1DmpSl887GgGxlVflFTPdttPc8n0o23IK9w23q98\n\tBLgbyYw+ZxUQI9QN8PCBJfcPHWoJq0YzPwK3wA7TwgWn51vmAaR2oPeSH1SSYA/8G1y/\n\tL1k03i3TgOpngExNi5h1Po5CkSP6nUpiuBV/CKXw7KdXq9gGffTzdCKL59cBqY9tZb2P\n\tlIcw==","X-Gm-Message-State":"AOAM533CI7OSqC0hRVsUhhaOIyZu3WGjRXjfZ+wwA9oNJkXePjPFNDEj\n\tP3vFv0QX6Oxiz1RCb8OkTcs8wU4n5ada1g==","X-Google-Smtp-Source":"ABdhPJxgXXS9SyNDkqikeu185KnyxK3L4mOXDVL29jCIAa2kM6sZwPK83dNigq7uU2mj4DwmNYppQg==","X-Received":"by 2002:a05:600c:1d13:b0:389:7a40:56e2 with SMTP id\n\tl19-20020a05600c1d1300b003897a4056e2mr695216wms.69.1646351417317; \n\tThu, 03 Mar 2022 15:50:17 -0800 (PST)","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 3 Mar 2022 23:49:54 +0000","Message-Id":"<20220303234956.1463551-8-djrscally@gmail.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20220303234956.1463551-1-djrscally@gmail.com>","References":"<20220303234956.1463551-1-djrscally@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that we have added lens controls, rename the existiing\nmember of the class to clarify that it relates to the sensor's\ncontrols.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Daniel Scally \n---\nChanges in v5:\n\n\t- None\n\nChanges since v4:\n\n\t- None\n\nChanges in v3:\n\n\t- New patch\n\n src/ipa/ipu3/ipu3.cpp | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 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;\n","prefixes":["libcamera-devel","v5","7/9"]}