{"id":15073,"url":"https://patchwork.libcamera.org/api/patches/15073/?format=json","web_url":"https://patchwork.libcamera.org/patch/15073/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20211207224512.753979-8-djrscally@gmail.com>","date":"2021-12-07T22:45:10","name":"[libcamera-devel,v3,7/9] libcamera: ipa: Rename ctrls_ member","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"646dd9f9238526118f89222ac914a9a1c3417818","submitter":{"id":90,"url":"https://patchwork.libcamera.org/api/people/90/?format=json","name":"Daniel Scally","email":"djrscally@gmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15073/mbox/","series":[{"id":2824,"url":"https://patchwork.libcamera.org/api/series/2824/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2824","date":"2021-12-07T22:45:03","name":"Enumerate CameraLens by following sensor's ancillary links","version":3,"mbox":"https://patchwork.libcamera.org/series/2824/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15073/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15073/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 05D86C3259\n\tfor ;\n\tTue, 7 Dec 2021 22:45:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D7E760890;\n\tTue, 7 Dec 2021 23:45:38 +0100 (CET)","from mail-wr1-x436.google.com (mail-wr1-x436.google.com\n\t[IPv6:2a00:1450:4864:20::436])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E3A860890\n\tfor ;\n\tTue, 7 Dec 2021 23:45:33 +0100 (CET)","by mail-wr1-x436.google.com with SMTP id o13so687745wrs.12\n\tfor ;\n\tTue, 07 Dec 2021 14:45:33 -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\ty12sm980332wrn.73.2021.12.07.14.45.32\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 07 Dec 2021 14:45:33 -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=\"gk4WY0qt\"; 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=MoUOTTwrvQhKd1EX+dNibtVZY1zAHBq/9uhUx2s5dnE=;\n\tb=gk4WY0qt3nT9UMKGtwDke85QXpHIjTSe1cDfi2E3270V64cAsp0HnJCuatLzZ75mrj\n\t+r7k7Hp7DgTbcvDPRcl/5GLLfLnjzY9SuDxQh+LOFVOcAqXJR7JUzm0nsgydU/DXh4qX\n\tF1fEZKKxTzCZTuhr8m2Ot7bfP6kU/cPlmn3cbvV+S8Oy8Wkb7/Y2MypUCuCrgQYHoj9z\n\t8l3XsWGAPnc553kAwZUAKBQZEu4PFDF/GMGO97+JvoJMfVqCaTYGzk5Q6xopxBfiaXEZ\n\tFovGp9GOgEWmSm8yRRBDFOQFtIGB+U2Er6loH/PxGBGIGt8WN7dSn8xBqBBTmmyxDCtS\n\t7WyQ==","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=MoUOTTwrvQhKd1EX+dNibtVZY1zAHBq/9uhUx2s5dnE=;\n\tb=HlOSy10iKAHTMc9NyxyewjvJ/nEn6/mcqusdH1ObQRM05/vyAEVdUyuM6WS56rtP+e\n\tQSEyScmT2lAcuUE/bXPxO03tIOQLoD3yA42aKvL+m9UJoHNoXGpnmN2o03Dftrq+hwbr\n\tCWhD0sQlVVq4yQPHuVayFT7/m1+nWBrm7DjOTmpxJC6qy4INUMERQN7iyzaiUmuwQKhF\n\tgiRuxkvy9/THRPffgf+9SkCisfLFI6qWe7LxPlQFYXGmdbNy3CZUZhRHKYQcLhHHj2We\n\tCNYCWF55O7Q2d0OSF+SWXWKQSC2/q1VtXMEJAOZDaL4kEMRr+5rn/oAeKBqWc4p4G3eQ\n\tL1GQ==","X-Gm-Message-State":"AOAM5300emIbs1zDGVGkNYIyvYTtJTFvaBZxNf+enf7p+4CylF99EGQ+\n\tiJQpQLvCOscGAGDLn2JQYpinqOZLJmQ=","X-Google-Smtp-Source":"ABdhPJz1ZNmMllYqrtNvZz4ZQotNp2p1s0rza6RgBZ3Ka+oc5vqkPeagk0uMG8sisMps5V/G36mi3w==","X-Received":"by 2002:adf:dbcb:: with SMTP id\n\te11mr52683403wrj.575.1638917133458; \n\tTue, 07 Dec 2021 14:45:33 -0800 (PST)","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 7 Dec 2021 22:45:10 +0000","Message-Id":"<20211207224512.753979-8-djrscally@gmail.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20211207224512.753979-1-djrscally@gmail.com>","References":"<20211207224512.753979-1-djrscally@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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\nSigned-off-by: Daniel Scally \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 3828650d..fe2bc3af 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -161,7 +161,7 @@ private:\n \n \tstd::map buffers_;\n \n-\tControlInfoMap ctrls_;\n+\tControlInfoMap sensorCtrls_;\n \tControlInfoMap lensCtrls_;\n \n \tIPACameraSensorInfo sensorInfo_;\n@@ -429,22 +429,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@@ -467,10 +467,10 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n \tlineDuration_ = sensorInfo_.lineLength * 1.0s / sensorInfo_.pixelRate;\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@@ -669,7 +669,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","v3","7/9"]}