From patchwork Tue Jun 28 09:06:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 16402 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 34C71BE173 for ; Tue, 28 Jun 2022 09:07:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F0C0F6563B; Tue, 28 Jun 2022 11:07:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1656407235; bh=K1Guve83AcE617R92eX/K8/fgyobek0+MOd8IhImbm8=; 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=Vumj7Hxz9RAmezoZyjhHmwxLeUfg2lSolSR39C25OAU6xjKRNGQ3qeavyK2Ho5U05 QCwCSmqI5TJf9ewzB0V1QtLFWsbcoHjppoJstymkJ0CuqYJdYDHS9xnHThx28g814H eCZQC4sSyA4QxpvtBuI8ICLpzDaPUQre9zjU+uwfAn6OAOdrSWNIrxbEskUWXFazdh StiJ5V6+IiMqm7o/W9JhBXLAkwcIAFwi/jyOl6FF5RnHTOO56uaoV1opRDiS8pCKmB UydqP9eg3VCRkj8/0yceaRUXDfxGUiVb1QNbL4Wg7ZzfnI45IsUyzM/HdLtVBxbWT2 /v5NhipwSZSNg== Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B70165633 for ; Tue, 28 Jun 2022 11:07:13 +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="PW5jxuGc"; dkim-atps=neutral Received: by mail-wm1-x335.google.com with SMTP id m184so6924834wme.1 for ; Tue, 28 Jun 2022 02:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xI05EEK/C5foWNjuVX6e/4IavLiNSTV1YJfqa/cQXMw=; b=PW5jxuGcVtSfi5tV3uQ/aml6pJu4WT/AW/I6z46wTGmG7g9EHLLpsLz3UFA9I1Vk/O cjkwT+M2U7D++SVT6tn7JIwTSxMGOgtU2JxRKhYLqV0qugovdL76Cwth3hn/gSCBQQat W34tAfDFKMzp3z0fIvMEAzkFUxrKg22iRbkYsKiZIqzR770FqMTLF77xziabsRy003GW 6Ly1EAEZ4DvehKdCzRl15nlfXPZ8x+t1f+gh2HWEFsZSP30GjxJ+x1MvqiZzR2NkjtpU ak5v9Zkg0ogNjEPB4IwSU17PhN8zIMF3yguvoleyKNpHXKiE3b4+3utv0NkoG7+PWHa7 iXvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xI05EEK/C5foWNjuVX6e/4IavLiNSTV1YJfqa/cQXMw=; b=Zevn0ZxF3t3bgX07+55e85Ef6yUsLG7s/1kRezgUZ3oTB7b9sOsAZNzozMhR5lZchi iP/xkgmj/EzyMRCVMW3GYMjZv/EYPVf5odNKsLNlQsmXs7sXCFIBN8GwCKGT5E9FxQTk wron2/WVhRksI7KYTgtJol/2FY2O8pyLw4yLrTlB6jVrhYZAXr7ClZuYmMtuus4PzrCY Bxj3p5zPOGLc256c/rbRZ7R9dV+QDmPd4sc2VOLmQXY1lUlYYoy14kryaDtnacVX/2QC h8pq0OWSi/v0KSIr6s7omt0OATj6UY+zjczdS0N5GJe82/BnnSnLOV3zENmPm1nSrTR1 OBYQ== X-Gm-Message-State: AJIora8ukNVpDQVLMt7fV/6uveLwjAa/nM2WynpxQjj9+pxty44gc4D2 nScM5k4Ebv/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 x13-20020a7bc20d000000b003a039e419e8mr25552846wmi.166.1656407232878; Tue, 28 Jun 2022 02:07:12 -0700 (PDT) Received: from localhost.localdomain (ip092042140082.rev.nessus.at. [92.42.140.82]) by smtp.gmail.com with ESMTPSA id r68-20020a1c2b47000000b0039c4b518df4sm20126972wmr.5.2022.06.28.02.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 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 Subject: [libcamera-devel] [PATCH 2/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 --- 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 7d6f0b39..3511a054 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -65,7 +65,7 @@ private: std::map buffers_; std::map mappedBuffers_; - ControlInfoMap ctrls_; + ControlInfoMap sensorCtrls_; /* Camera sensor controls. */ bool autoExposure_; @@ -148,16 +148,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; } @@ -284,7 +284,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));