From patchwork Wed May 8 11:53:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 20020 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 04EA4BDE6B for ; Wed, 8 May 2024 11:53:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A39FC63437; Wed, 8 May 2024 13:53:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="JrBGnYtL"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C9C061A73 for ; Wed, 8 May 2024 13:53:55 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ADCE4B0B; Wed, 8 May 2024 13:53:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715169232; bh=J9GP34UxqPjW2V4xeSI0HhSYhpMNcTNacPnyr2Si8ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JrBGnYtL276gU7a2kIXG2kwP12S/sq/JbTzPauOvgUVglbiPe2SGcLuiMNhLsh3p3 GzNxYuVJodbTli6B/ZRUTmZFsYZ1jPZoSXCCgP48nXPPaexiI1CvHQN+wmvjL+QUm0 uo+nnBW59Faa28maiBj33YONEW5FC8gmGngOiPCo= From: Kieran Bingham To: libcamera devel , Daniel Scally Cc: Kieran Bingham Subject: [PATCH 2/2] fixup! ipa: ipu3: Remove bespoke AGC functions from IPU3 Date: Wed, 8 May 2024 12:53:51 +0100 Message-Id: <20240508115351.4183582-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240502133046.1976565-7-dan.scally@ideasonboard.com> References: <20240502133046.1976565-7-dan.scally@ideasonboard.com> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" I will apply the series with the following fixup. Fixes: FAILED: src/ipa/ipu3/ipa_ipu3.so.p/algorithms_agc.cpp.o clang++ -Isrc/ipa/ipu3/ipa_ipu3.so.p -Isrc/ipa/ipu3 -I../src/ipa/ipu3 -Iinclude -I../include -Isrc/ipa -I../src/ipa -Iinclude/libcamera/ipa -Iinclude/libcamera -fcolor-diagnostics -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c++17 -O0 -g -stdlib=libc++ -Wextra-semi -Wthread-safety -Wshadow -include /builds/camera/libcamera/build/config.h -Wno-c99-designator -fPIC -DLIBCAMERA_BASE_PRIVATE -MD -MQ src/ipa/ipu3/ipa_ipu3.so.p/algorithms_agc.cpp.o -MF src/ipa/ipu3/ipa_ipu3.so.p/algorithms_agc.cpp.o.d -o src/ipa/ipu3/ipa_ipu3.so.p/algorithms_agc.cpp.o -c ../src/ipa/ipu3/algorithms/agc.cpp ../src/ipa/ipu3/algorithms/agc.cpp:60:25: error: unused variable 'kEvGainTarget' [-Werror,-Wunused-const-variable] static constexpr double kEvGainTarget = 0.5; ^ ../src/ipa/ipu3/algorithms/agc.cpp:63:27: error: unused variable 'kNumStartupFrames' [-Werror,-Wunused-const-variable] static constexpr uint32_t kNumStartupFrames = 10; ^ ../src/ipa/ipu3/algorithms/agc.cpp:71:25: error: unused variable 'kRelativeLuminanceTarget' [-Werror,-Wunused-const-variable] static constexpr double kRelativeLuminanceTarget = 0.16; ^ 3 errors generated. Signed-off-by: Kieran Bingham --- src/ipa/ipu3/algorithms/agc.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp index e1bca07f7646..c9b5548c4548 100644 --- a/src/ipa/ipu3/algorithms/agc.cpp +++ b/src/ipa/ipu3/algorithms/agc.cpp @@ -56,20 +56,6 @@ static constexpr utils::Duration kMaxShutterSpeed = 60ms; /* Histogram constants */ static constexpr uint32_t knumHistogramBins = 256; -/* Target value to reach for the top 2% of the histogram */ -static constexpr double kEvGainTarget = 0.5; - -/* Number of frames to wait before calculating stats on minimum exposure */ -static constexpr uint32_t kNumStartupFrames = 10; - -/* - * Relative luminance target. - * - * It's a number that's chosen so that, when the camera points at a grey - * target, the resulting image brightness is considered right. - */ -static constexpr double kRelativeLuminanceTarget = 0.16; - Agc::Agc() : minShutterSpeed_(0s), maxShutterSpeed_(0s) {