From patchwork Wed Dec 6 10:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 19286 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 13D0CC32BD for ; Wed, 6 Dec 2023 10:38:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 645E062B2C; Wed, 6 Dec 2023 11:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1701859127; bh=ni2QX6pma5m3c0EiLshQSYkCMzf2cqIxtSOG4x8MMt4=; 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=zAFXLhN2HS9rZzz3vv5TM5pd3m34/E4ojhzX6yk385ph3imvA6X8bEInI6/qPU0su efFbT/G4UNOaGO2fRD2D+OSLmd00rzLuAh+lrntkvCyJs44PtuNdI43oqMYR5e8nH8 PQ1v72OpVH/8dzMDylvmxS2NC0KbxSLB7F/eBOYXGG6JzKfyJSCLn355cy7A6Su1bT 5juhyzNKPivsmohY5OIkFMNOwbTLMHbLZKNQnOgbSS1yF8dbdztI0Oz4k+P2nDcPfo E2CI0rwDexfzVE6fX1C2FQjXKLLQKIP91sY3iMCL0l19TJMcSCin2LffVGklSHDWrO H/MzVZz0lU7Aw== Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C6C8661D9D for ; Wed, 6 Dec 2023 11:38:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="IvlxspLF"; dkim-atps=neutral Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-334af3b3ddfso122150f8f.3 for ; Wed, 06 Dec 2023 02:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1701859124; x=1702463924; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SH1bgtabT2/Y07DB0FvYUY/ZLjVIDck7Ae1kliUNlaY=; b=IvlxspLF6GO7y9nEIf4e9jWV4ui/IohuXUucXa2suZLxlrva7oCaCzkSKgjfp1eOK/ 4iEKHVLWN2GGucOnvdcmFHHUqBHgqzrJNeD1KoDBaHYTmkx4zLfltD0k4wNiaYoE1wAx SST8lJ7Ie/4+zJDG14ZfUMJbibKAe1xfMkI1kyB84R2K6+9DQ71oUCfhl8gD0m7N/oUf 4awkFeWVJuR+gijJfyBXVSvVzEp4USwR7MA2b60xOyWm1f/PLbTe8rOcT/P39Wxy46ra NvcoA38n7/ooi2RjoTp7M7/aTrDl5UJvh1b2tLRI6tFw7gOi/DYvihAzrqmZE3igBPQ0 ZPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701859124; x=1702463924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SH1bgtabT2/Y07DB0FvYUY/ZLjVIDck7Ae1kliUNlaY=; b=Hklqb8F13TKb0BAdgGTJsat2EjTTVkg7V0cB+PAnl/s9tNJ850hE72n/lOo0i7uh4R p2b5gfveIWgcn2PPY2n5R2f5CqcqHrvI6pdOeDj/Zxd977+0OOIvEWvD93s9MRRrfCC7 N2mshYqSHPqThs7DeQAztFu0lYG7FPBP6hARbjOo2UgRwmDIVy0XfzNjwyiLcQw+WYW+ mMMEbCMvOQL2cB77ywobxy79YkW/dfS7tVM/LotY+5v2NCmA9byOxAyXe/oO2OGuoILJ Iol3SwD7l/8zXvtkLSGMDr2ahZFYjLLY9N3dkYCU1OPuMq62yz1e/xHBY0LvHk7uEJwf hf2A== X-Gm-Message-State: AOJu0YzerXe2OdEceiDuIVASbGZuBd0IizobGSS1yp19MK/ZeQk/N2Yo vfLlw10fT5ekwGwoP12s8WQG+iiYTNlr5iVBLlo= X-Google-Smtp-Source: AGHT+IE94/A2Q/NdH8+cWw8q4Yly/6Kyf8/yi2x53oXC0ZNiQT+7x+xrwlW46X3yl60f4MvhEyXxgg== X-Received: by 2002:a5d:5002:0:b0:333:4bd9:78 with SMTP id e2-20020a5d5002000000b003334bd90078mr320759wrt.15.1701859124027; Wed, 06 Dec 2023 02:38:44 -0800 (PST) Received: from localhost.localdomain ([194.233.231.115]) by smtp.gmail.com with ESMTPSA id w7-20020a5d6087000000b0033340937da6sm9733697wrt.95.2023.12.06.02.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 02:38:43 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Wed, 6 Dec 2023 10:38:39 +0000 Message-Id: <20231206103839.16607-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231206103839.16607-1-david.plowman@raspberrypi.com> References: <20231206103839.16607-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] ipa: rpi: awb: Add an initialValues method 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: David Plowman via libcamera-devel From: David Plowman Reply-To: David Plowman Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This allows the IPA to get reasonable default colour gains before AWB has run. This is particularly important on the PiSP platform where these numbers are helpful in programming the Front End statistics block in advance. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck --- src/ipa/rpi/controller/awb_algorithm.h | 1 + src/ipa/rpi/controller/rpi/awb.cpp | 6 ++++++ src/ipa/rpi/controller/rpi/awb.h | 1 + 3 files changed, 8 insertions(+) diff --git a/src/ipa/rpi/controller/awb_algorithm.h b/src/ipa/rpi/controller/awb_algorithm.h index 8462c4db..6009bdac 100644 --- a/src/ipa/rpi/controller/awb_algorithm.h +++ b/src/ipa/rpi/controller/awb_algorithm.h @@ -16,6 +16,7 @@ public: AwbAlgorithm(Controller *controller) : Algorithm(controller) {} /* An AWB algorithm must provide the following: */ virtual unsigned int getConvergenceFrames() const = 0; + virtual void initialValues(double &gainR, double &gainB) = 0; virtual void setMode(std::string const &modeName) = 0; virtual void setManualGains(double manualR, double manualB) = 0; virtual void enableAuto() = 0; diff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp index 5ae0c2fa..dde5785a 100644 --- a/src/ipa/rpi/controller/rpi/awb.cpp +++ b/src/ipa/rpi/controller/rpi/awb.cpp @@ -220,6 +220,12 @@ void Awb::initialise() asyncResults_ = syncResults_; } +void Awb::initialValues(double &gainR, double &gainB) +{ + gainR = syncResults_.gainR; + gainB = syncResults_.gainB; +} + void Awb::disableAuto() { /* Freeze the most recent values, and treat them as manual gains */ diff --git a/src/ipa/rpi/controller/rpi/awb.h b/src/ipa/rpi/controller/rpi/awb.h index e7d49cd8..cde6a62f 100644 --- a/src/ipa/rpi/controller/rpi/awb.h +++ b/src/ipa/rpi/controller/rpi/awb.h @@ -95,6 +95,7 @@ public: void initialise() override; int read(const libcamera::YamlObject ¶ms) override; unsigned int getConvergenceFrames() const override; + void initialValues(double &gainR, double &gainB) override; void setMode(std::string const &name) override; void setManualGains(double manualR, double manualB) override; void enableAuto() override;