From patchwork Tue Aug 9 14:47:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 17048 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B85B6C3272 for ; Tue, 9 Aug 2022 14:47:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 701BF6332B; Tue, 9 Aug 2022 16:47:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1660056433; bh=WQkdgTVG3hetfoDKXcDN22AlAySAJ+/ln+M90qR+WjM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TTtxaePDB2JclrbiyY6xpRryCDu1o4I5uLSFIKWPTQktwS0VZ0/e9WRvsqoR41ZNW BX6mX5CIU9eovq0aX32VCE41jtgBtmEu1rZHnOiwxPk/6l+BPtHk6uzU5jM5wUcuUJ 2k7mjpBZmaM0wm0k38d1OyGLuc+lxfw8+9irGf1Q1E9rLp8It3iD+pZi3pccf8ofef Pt1UT/M/trMew8PGvOil1+dNcGy3VPmcHZfgVlkt7cC8iz5QpdCthHeR+F0pntqMd2 s8VSY+AKnAfrcr6JjjtuYbWNhwou2ZtubRWN+ojpIXZgpZiX4MuzloKS47G956dE5V 2YCwNV5wzldUw== Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 041D363326 for ; Tue, 9 Aug 2022 16:47:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=thaumatec-com.20210112.gappssmtp.com header.i=@thaumatec-com.20210112.gappssmtp.com header.b="D4EXp1kA"; dkim-atps=neutral Received: by mail-ed1-x535.google.com with SMTP id r4so15385314edi.8 for ; Tue, 09 Aug 2022 07:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=i7m85d36XekqKOHcB/TG7CCkjvmb2lQA7sbkC1OlJZw=; b=D4EXp1kAUgGyIfdNBNQKilVPJTNc0bcoM2XrMWcx0NUBvFWbd8PmyFvvNAYxHUg1Xb 7EbUSEO/MpBoQeYddrHjL0Y/Q3FNnvC33/nKbppw4Jsqph/2EFEKRfCfhJASoKPTpYQ0 4U/8vz7NcWH4vQEQ+fLqIkZWR+zuF07KZhrqE2AfWl7SkUJ+RKbKpnuJhL7Xsqbwk9BX iVfaditCsGOtfdUAAnil8/PGfJMDyVVnpkUgmdduH5SfBTBGw663EdAxOcRXjLWaGNQj p+ACc+qyLUJvI8+CN6nwZMrkGcgWQ2lxsBAyMZub3rCDsDEjDjIADfEuwpqGqWzmzKS5 RZdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=i7m85d36XekqKOHcB/TG7CCkjvmb2lQA7sbkC1OlJZw=; b=qQWx1k9MlVHIqOkWr/SNluBz/YLR/t+tMsf1St2G/Z5x/fSS9L4uLSfk3pYZR2ax3v R9hh65O9Ot5JGoi0ZX+FcILjEHkvFM/nQCqxb6c2QTQ+/d9G3QkqQospcquwTXG3Yphj NWx+DPHJE+E6kea96Q+aslqNC43FoZtQvq/i+G0BmGE2yPYMPDLLqKtvlEuNpRAgsrGm 5o7pBsUTofL/6o+lUea3HdDbVHxRGJYzExBCKRYq/DIUKtw1yKuunhfl02KHGMtbB4Xo yI2wfQDL9p4gj5mnkh7UCbRnoJN99X7FT7LMH4Ag5OFko5aFBOqtRDHVqE//mHhoJvSK Gctg== X-Gm-Message-State: ACgBeo3XgwTGn9WPO5x2yhFVwXc5Q0Dt0CriwHV2YY3lFaUevkLBE8Mq CqHgtcHPL19TB+MdDTsxmeVzqK0u1vB7NA== X-Google-Smtp-Source: AA6agR4GJ7DOHJDfNZMqReKQiUsj+1K2cmXr6roDApxeN8TOvyMAZ+jTO8JmvvSGIeNBPaAYOpBHoA== X-Received: by 2002:a05:6402:1e8c:b0:43d:db52:78a8 with SMTP id f12-20020a0564021e8c00b0043ddb5278a8mr21432378edf.324.1660056429680; Tue, 09 Aug 2022 07:47:09 -0700 (PDT) Received: from localhost.localdomain (ip092042140082.rev.nessus.at. [92.42.140.82]) by smtp.gmail.com with ESMTPSA id cn15-20020a0564020caf00b0043ba0cf5dbasm6058486edb.2.2022.08.09.07.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 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 Subject: [libcamera-devel] [PATCH v2 1/3] libcamera: rkisp1: ipa: Rename ctrls_ to sensorCtrls_ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Daniel Semkowicz via libcamera-devel From: Daniel Semkowicz Reply-To: Daniel Semkowicz Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" As additional controls will be added to the IPA (like lens), we want to have more specific names for each ControlInfoMap. Signed-off-by: Daniel Semkowicz Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/ipa/rkisp1/rkisp1.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 17d42d38..ee484845 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -69,7 +69,7 @@ private: std::map buffers_; std::map mappedBuffers_; - ControlInfoMap ctrls_; + ControlInfoMap sensorCtrls_; /* Camera sensor controls. */ bool autoExposure_; @@ -199,16 +199,16 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info, if (entityControls.empty()) return -EINVAL; - ctrls_ = entityControls.at(0); + sensorCtrls_ = entityControls.at(0); - const auto itExp = ctrls_.find(V4L2_CID_EXPOSURE); - if (itExp == ctrls_.end()) { + const auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE); + if (itExp == sensorCtrls_.end()) { LOG(IPARkISP1, Error) << "Can't find exposure control"; return -EINVAL; } - const auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN); - if (itGain == ctrls_.end()) { + const auto itGain = sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN); + if (itGain == sensorCtrls_.end()) { LOG(IPARkISP1, Error) << "Can't find gain control"; return -EINVAL; } @@ -336,7 +336,7 @@ void IPARkISP1::setControls(unsigned int frame) uint32_t exposure = context_.frameContext.agc.exposure; uint32_t gain = camHelper_->gainCode(context_.frameContext.agc.gain); - ControlList ctrls(ctrls_); + ControlList ctrls(sensorCtrls_); ctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure)); ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain));