{"id":17048,"url":"https://patchwork.libcamera.org/api/patches/17048/?format=json","web_url":"https://patchwork.libcamera.org/patch/17048/","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":"<20220809144704.61682-2-dse@thaumatec.com>","date":"2022-08-09T14:47:02","name":"[libcamera-devel,v2,1/3] libcamera: rkisp1: ipa: Rename ctrls_ to sensorCtrls_","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"94e6cb7fbf5ca01652263434a7da86409643d6c9","submitter":{"id":126,"url":"https://patchwork.libcamera.org/api/people/126/?format=json","name":"Daniel Semkowicz","email":"dse@thaumatec.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17048/mbox/","series":[{"id":3398,"url":"https://patchwork.libcamera.org/api/series/3398/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3398","date":"2022-08-09T14:47:01","name":"libcamera: rkisp1: Add lens control","version":2,"mbox":"https://patchwork.libcamera.org/series/3398/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17048/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17048/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 B85B6C3272\n\tfor ;\n\tTue, 9 Aug 2022 14:47:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 701BF6332B;\n\tTue, 9 Aug 2022 16:47:13 +0200 (CEST)","from mail-ed1-x535.google.com (mail-ed1-x535.google.com\n\t[IPv6:2a00:1450:4864:20::535])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 041D363326\n\tfor ;\n\tTue, 9 Aug 2022 16:47:10 +0200 (CEST)","by mail-ed1-x535.google.com with SMTP id r4so15385314edi.8\n\tfor ;\n\tTue, 09 Aug 2022 07:47:10 -0700 (PDT)","from localhost.localdomain (ip092042140082.rev.nessus.at.\n\t[92.42.140.82]) by smtp.gmail.com with ESMTPSA id\n\tcn15-20020a0564020caf00b0043ba0cf5dbasm6058486edb.2.2022.08.09.07.47.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Aug 2022 07:47:09 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660056433;\n\tbh=WQkdgTVG3hetfoDKXcDN22AlAySAJ+/ln+M90qR+WjM=;\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=TTtxaePDB2JclrbiyY6xpRryCDu1o4I5uLSFIKWPTQktwS0VZ0/e9WRvsqoR41ZNW\n\tBX6mX5CIU9eovq0aX32VCE41jtgBtmEu1rZHnOiwxPk/6l+BPtHk6uzU5jM5wUcuUJ\n\t2k7mjpBZmaM0wm0k38d1OyGLuc+lxfw8+9irGf1Q1E9rLp8It3iD+pZi3pccf8ofef\n\tPt1UT/M/trMew8PGvOil1+dNcGy3VPmcHZfgVlkt7cC8iz5QpdCthHeR+F0pntqMd2\n\ts8VSY+AKnAfrcr6JjjtuYbWNhwou2ZtubRWN+ojpIXZgpZiX4MuzloKS47G956dE5V\n\t2YCwNV5wzldUw==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=thaumatec-com.20210112.gappssmtp.com; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc;\n\tbh=i7m85d36XekqKOHcB/TG7CCkjvmb2lQA7sbkC1OlJZw=;\n\tb=D4EXp1kAUgGyIfdNBNQKilVPJTNc0bcoM2XrMWcx0NUBvFWbd8PmyFvvNAYxHUg1Xb\n\t7EbUSEO/MpBoQeYddrHjL0Y/Q3FNnvC33/nKbppw4Jsqph/2EFEKRfCfhJASoKPTpYQ0\n\t4U/8vz7NcWH4vQEQ+fLqIkZWR+zuF07KZhrqE2AfWl7SkUJ+RKbKpnuJhL7Xsqbwk9BX\n\tiVfaditCsGOtfdUAAnil8/PGfJMDyVVnpkUgmdduH5SfBTBGw663EdAxOcRXjLWaGNQj\n\tp+ACc+qyLUJvI8+CN6nwZMrkGcgWQ2lxsBAyMZub3rCDsDEjDjIADfEuwpqGqWzmzKS5\n\tRZdQ=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=thaumatec-com.20210112.gappssmtp.com\n\theader.i=@thaumatec-com.20210112.gappssmtp.com header.b=\"D4EXp1kA\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc;\n\tbh=i7m85d36XekqKOHcB/TG7CCkjvmb2lQA7sbkC1OlJZw=;\n\tb=qQWx1k9MlVHIqOkWr/SNluBz/YLR/t+tMsf1St2G/Z5x/fSS9L4uLSfk3pYZR2ax3v\n\tR9hh65O9Ot5JGoi0ZX+FcILjEHkvFM/nQCqxb6c2QTQ+/d9G3QkqQospcquwTXG3Yphj\n\tNWx+DPHJE+E6kea96Q+aslqNC43FoZtQvq/i+G0BmGE2yPYMPDLLqKtvlEuNpRAgsrGm\n\t5o7pBsUTofL/6o+lUea3HdDbVHxRGJYzExBCKRYq/DIUKtw1yKuunhfl02KHGMtbB4Xo\n\tyI2wfQDL9p4gj5mnkh7UCbRnoJN99X7FT7LMH4Ag5OFko5aFBOqtRDHVqE//mHhoJvSK\n\tGctg==","X-Gm-Message-State":"ACgBeo3XgwTGn9WPO5x2yhFVwXc5Q0Dt0CriwHV2YY3lFaUevkLBE8Mq\n\tCqHgtcHPL19TB+MdDTsxmeVzqK0u1vB7NA==","X-Google-Smtp-Source":"AA6agR4GJ7DOHJDfNZMqReKQiUsj+1K2cmXr6roDApxeN8TOvyMAZ+jTO8JmvvSGIeNBPaAYOpBHoA==","X-Received":"by 2002:a05:6402:1e8c:b0:43d:db52:78a8 with SMTP id\n\tf12-20020a0564021e8c00b0043ddb5278a8mr21432378edf.324.1660056429680; \n\tTue, 09 Aug 2022 07:47:09 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 9 Aug 2022 16:47:02 +0200","Message-Id":"<20220809144704.61682-2-dse@thaumatec.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220809144704.61682-1-dse@thaumatec.com>","References":"<20220809144704.61682-1-dse@thaumatec.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"Daniel Semkowicz via libcamera-devel\n\t","Reply-To":"Daniel Semkowicz ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"As 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 \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 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 \n","prefixes":["libcamera-devel","v2","1/3"]}