{"id":16402,"url":"https://patchwork.libcamera.org/api/1.1/patches/16402/?format=json","web_url":"https://patchwork.libcamera.org/patch/16402/","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":"<20220628090656.19572-3-dse@thaumatec.com>","date":"2022-06-28T09:06:55","name":"[libcamera-devel,2/3] libcamera: rkisp1: ipa: Rename ctrls_ to sensorCtrls_","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"94e6cb7fbf5ca01652263434a7da86409643d6c9","submitter":{"id":126,"url":"https://patchwork.libcamera.org/api/1.1/people/126/?format=json","name":"Daniel Semkowicz","email":"dse@thaumatec.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16402/mbox/","series":[{"id":3228,"url":"https://patchwork.libcamera.org/api/1.1/series/3228/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3228","date":"2022-06-28T09:06:53","name":"libcamera: rkisp1: Add lens control","version":1,"mbox":"https://patchwork.libcamera.org/series/3228/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16402/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16402/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 34C71BE173\n\tfor ;\n\tTue, 28 Jun 2022 09:07:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F0C0F6563B;\n\tTue, 28 Jun 2022 11:07:14 +0200 (CEST)","from mail-wm1-x335.google.com (mail-wm1-x335.google.com\n\t[IPv6:2a00:1450:4864:20::335])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B70165633\n\tfor ;\n\tTue, 28 Jun 2022 11:07:13 +0200 (CEST)","by mail-wm1-x335.google.com with SMTP id m184so6924834wme.1\n\tfor ;\n\tTue, 28 Jun 2022 02:07:13 -0700 (PDT)","from localhost.localdomain (ip092042140082.rev.nessus.at.\n\t[92.42.140.82]) by smtp.gmail.com with ESMTPSA id\n\tr68-20020a1c2b47000000b0039c4b518df4sm20126972wmr.5.2022.06.28.02.07.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 28 Jun 2022 02:07:12 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656407235;\n\tbh=K1Guve83AcE617R92eX/K8/fgyobek0+MOd8IhImbm8=;\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=Vumj7Hxz9RAmezoZyjhHmwxLeUfg2lSolSR39C25OAU6xjKRNGQ3qeavyK2Ho5U05\n\tQCwCSmqI5TJf9ewzB0V1QtLFWsbcoHjppoJstymkJ0CuqYJdYDHS9xnHThx28g814H\n\teCZQC4sSyA4QxpvtBuI8ICLpzDaPUQre9zjU+uwfAn6OAOdrSWNIrxbEskUWXFazdh\n\tStiJ5V6+IiMqm7o/W9JhBXLAkwcIAFwi/jyOl6FF5RnHTOO56uaoV1opRDiS8pCKmB\n\tUydqP9eg3VCRkj8/0yceaRUXDfxGUiVb1QNbL4Wg7ZzfnI45IsUyzM/HdLtVBxbWT2\n\t/v5NhipwSZSNg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=thaumatec-com.20210112.gappssmtp.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=xI05EEK/C5foWNjuVX6e/4IavLiNSTV1YJfqa/cQXMw=;\n\tb=PW5jxuGcVtSfi5tV3uQ/aml6pJu4WT/AW/I6z46wTGmG7g9EHLLpsLz3UFA9I1Vk/O\n\tcjkwT+M2U7D++SVT6tn7JIwTSxMGOgtU2JxRKhYLqV0qugovdL76Cwth3hn/gSCBQQat\n\tW34tAfDFKMzp3z0fIvMEAzkFUxrKg22iRbkYsKiZIqzR770FqMTLF77xziabsRy003GW\n\t6Ly1EAEZ4DvehKdCzRl15nlfXPZ8x+t1f+gh2HWEFsZSP30GjxJ+x1MvqiZzR2NkjtpU\n\tak5v9Zkg0ogNjEPB4IwSU17PhN8zIMF3yguvoleyKNpHXKiE3b4+3utv0NkoG7+PWHa7\n\tiXvw=="],"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=\"PW5jxuGc\"; \n\tdkim-atps=neutral","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=xI05EEK/C5foWNjuVX6e/4IavLiNSTV1YJfqa/cQXMw=;\n\tb=Zevn0ZxF3t3bgX07+55e85Ef6yUsLG7s/1kRezgUZ3oTB7b9sOsAZNzozMhR5lZchi\n\tiP/xkgmj/EzyMRCVMW3GYMjZv/EYPVf5odNKsLNlQsmXs7sXCFIBN8GwCKGT5E9FxQTk\n\twron2/WVhRksI7KYTgtJol/2FY2O8pyLw4yLrTlB6jVrhYZAXr7ClZuYmMtuus4PzrCY\n\tBxj3p5zPOGLc256c/rbRZ7R9dV+QDmPd4sc2VOLmQXY1lUlYYoy14kryaDtnacVX/2QC\n\th8pq0OWSi/v0KSIr6s7omt0OATj6UY+zjczdS0N5GJe82/BnnSnLOV3zENmPm1nSrTR1\n\tOBYQ==","X-Gm-Message-State":"AJIora8ukNVpDQVLMt7fV/6uveLwjAa/nM2WynpxQjj9+pxty44gc4D2\n\tnScM5k4Ebv/dUOZC73PkehIh3gQIUoiFSg==","X-Google-Smtp-Source":"AGRyM1s7Jb6/Kx6U/R7hJ+HJ/JqzoYy1+SstX8USN2npEPlRGQfKwBf/glvTiM9P8/gv9nuy7vKByg==","X-Received":"by 2002:a7b:c20d:0:b0:3a0:39e4:19e8 with SMTP id\n\tx13-20020a7bc20d000000b003a039e419e8mr25552846wmi.166.1656407232878; \n\tTue, 28 Jun 2022 02:07:12 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 28 Jun 2022 11:06:55 +0200","Message-Id":"<20220628090656.19572-3-dse@thaumatec.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220628090656.19572-1-dse@thaumatec.com>","References":"<20220628090656.19572-1-dse@thaumatec.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/3] libcamera: rkisp1: ipa: Rename ctrls_\n\tto 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 \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 7d6f0b39..3511a054 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -65,7 +65,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@@ -148,16 +148,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@@ -284,7 +284,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","2/3"]}