From patchwork Tue Oct 8 08:13:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 21532 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 C02EEBD80A for ; Tue, 8 Oct 2024 08:13:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3B5D63537; Tue, 8 Oct 2024 10:13:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Avlsvkxg"; dkim-atps=neutral Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 37C6A62C8E for ; Tue, 8 Oct 2024 10:13:28 +0200 (CEST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-37d371840efso91f8f.3 for ; Tue, 08 Oct 2024 01:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1728375207; x=1728980007; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pT1XzziQ0sR/LBkzMPdWZArxo/iYlN07w1b9fXTe5o0=; b=Avlsvkxg53mSf+MqvqxcFeKmx8eInmeBvkRknRZbj54898RWOZVmacKU/+jTyRDf6y CWV3e42U8WOVssl+KCwhCKwmIQNG3C7AeCbWodNSj5CvE6PIhbbONVq0IiwsR+lrkkdc K7NvKOtgm3bjKsK4ThCWP7HB19Kbu4MP1wNcpgV4B3YWcM09B8w5AWpK+a+V8lIwgaw2 N2/vqKnzjD3xXBst0Zb7ZcCXcoChJxQY3EIbFhlXLgB0rte6g2ROMNR/HQTGZjcQQ+wX L2WforiTpB2x2cpsHn1Xr+72NUfxkaG0DYG80gNgRexBrtIlg9llzEnSXVLnWFUGhtY+ vx2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728375207; x=1728980007; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pT1XzziQ0sR/LBkzMPdWZArxo/iYlN07w1b9fXTe5o0=; b=ODqhpZ7SlJHOwT0wRSxPHy+4Jmek37avCnYJ5sXl2jLFYAQWP0QyFUvSzoO1jMTooc uO8gsrlBY6Npkw3B6iIwVnu2n5mB4bzuxthALw3EoGwLCzQUtf1rHJRyQi1cqX98Bk+x uZVsDgBuAizEEDiwJehEXKvY6DQKtGnmp/1eYDYJvQeWMp4HvNFCJhWAgsHSIhOov1Hg EkIAldigs8Lfp5jYyjSwlCX0Pw0b72h8U4yDEHQcLa7SVBHMouIaGZORWrr/5tFUG3ni YpMhJ5pWsuQWxFEFlWs3Qn5Fe1aObJmCdHoH+DGjTPf5/bfvsAz3Iqewwf90yBkDN7VQ AlAA== X-Gm-Message-State: AOJu0YyLsMcnemA92ycJ4TvrnpAMpMlPocsN9VBlhJtC9CUesM8hIP/S qN9EHeqgNEO7zLLbgGky/08SQCZw4MOLxHdROtJHjmtMQEoDNXk5h47AN3YoJpjdu/K35D9B3ZT 8 X-Google-Smtp-Source: AGHT+IHnODnGqQCehHs3xiRSygzegT/3LQgP2MhxZ9Ac8WEudjpTvTKXF7iJFIetEi3X0jCZHLFIfQ== X-Received: by 2002:a5d:5887:0:b0:374:c2ce:eb1e with SMTP id ffacd0b85a97d-37d0e7d66aamr4329684f8f.8.1728375207313; Tue, 08 Oct 2024 01:13:27 -0700 (PDT) Received: from naush-laptop.pitowers.org ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d1695e62bsm7492587f8f.81.2024.10.08.01.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 01:13:26 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Cc: Naushir Patuck , David Plowman , Laurent Pinchart Subject: [PATCH v3 1/2] ipa: rpi: awb: Add a const for the default colour temperature Date: Tue, 8 Oct 2024 09:13:16 +0100 Message-Id: <20241008081317.24602-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 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" A default CT of 4500K is used in a couple of places. Add a constexpr value for the default CT value and use it instead. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/rpi/controller/rpi/awb.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp index e5d51092605e..65416d05b28e 100644 --- a/src/ipa/rpi/controller/rpi/awb.cpp +++ b/src/ipa/rpi/controller/rpi/awb.cpp @@ -21,6 +21,8 @@ using namespace libcamera; LOG_DEFINE_CATEGORY(RPiAwb) +constexpr double kDefaultCT = 4500.0; + #define NAME "rpi.awb" /* @@ -215,7 +217,7 @@ void Awb::initialise() syncResults_.gainB = 1.0 / config_.ctB.eval(syncResults_.temperatureK); } else { /* random values just to stop the world blowing up */ - syncResults_.temperatureK = 4500; + syncResults_.temperatureK = kDefaultCT; syncResults_.gainR = syncResults_.gainG = syncResults_.gainB = 1.0; } prevSyncResults_ = syncResults_; @@ -717,7 +719,11 @@ void Awb::awbGrey() sumR += *ri, sumB += *bi; double gainR = sumR.G / (sumR.R + 1), gainB = sumB.G / (sumB.B + 1); - asyncResults_.temperatureK = 4500; /* don't know what it is */ + /* + * The grey world model can't estimate the colour temperature, use a + * default value. + */ + asyncResults_.temperatureK = kDefaultCT; asyncResults_.gainR = gainR; asyncResults_.gainG = 1.0; asyncResults_.gainB = gainB;