From patchwork Thu Apr 8 13:36:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 11872 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 CE266BD16B for ; Thu, 8 Apr 2021 13:36:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 45673602CD; Thu, 8 Apr 2021 15:36:43 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="lgXBVoby"; dkim-atps=neutral Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 290BF602CD for ; Thu, 8 Apr 2021 15:36:41 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id o20-20020a05600c4fd4b0290114265518afso1249942wmq.4 for ; Thu, 08 Apr 2021 06:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bPgy71T3ChQPM1WXwYAkhYqDaJuQNuEYvNRjWcTa3CM=; b=lgXBVobyQ/odebYVLuWoq+WA8050xFFeCK98SDfgxw4JMKcyxxHasz0rUdxNgy7r79 YGQKJ+zuBPCHJmvEaADqPnRlLn4HLvZOIUrndsFHA/MSjJo1k4hd7fOooDDWuDkC1I3j BmsOsu4CbjDEIvDTK74qE1Hp5JalTU4IPIMy1aPFqwQZBeWtPNdsX9OwCEDZ86w5WGJh X+uk0iEpqTqtxpGiVp6MFy00myZ+t2OsOoh1hgDeAqkz+1NVkWDCaM3bHCklxc9yhDzV flLobboHXN7HdNXHoul1EzDPXZ5JGs1khyulDBZwGkKwthLHEeOwvYR/lP2q+C/KaZQF IqBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bPgy71T3ChQPM1WXwYAkhYqDaJuQNuEYvNRjWcTa3CM=; b=boS3ogx0Q4Jwxc+37ehHdFxFzP+CcCubgr9+OsB2hlEZaRNpwZ8ZXmbfZ0YtIthf6d KNSy+rWj8GqKXkf7NAgxY9plrMDtw12R5LvUQ4Amwq0a+934JqLCjbGmKte6k+74bIiu cqXWs9TRsIaqVjWAQ21GnvfVKjmkYyMEumIqK7RQKQ1rZ4vQ5MxDbdPQMY4HgAj/aex4 tRjvvm8biUw9yUiYuOGCQKTtcSUyIRZtmyO93+q3S1GPvqVCbU+5NOSCxcoR7HR7vBUx +ouxD8C+sP2Mu5ET7NtO17F+LCkxmKUS+rxCZtlctohJqW+5JpiXKpBHVUSTBC5hXB58 ep/Q== X-Gm-Message-State: AOAM531JCa2TMa3Yo4JK6q7klpP0nD0WtKcQ+JbDPgmCCX6xdDjaHSZX QDtwuYyLCQUV9eiHLU6h7jwHGMaME2QLOQ== X-Google-Smtp-Source: ABdhPJwI4uXi5hPVz+UH1Jbubp0Haos0PY+UIk2ILnlbLcYV9Hss8qEYi7tdcvq2hXOvUccZCd090A== X-Received: by 2002:a7b:c1c4:: with SMTP id a4mr8397811wmj.67.1617889000615; Thu, 08 Apr 2021 06:36:40 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id z18sm13132522wmc.27.2021.04.08.06.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 06:36:40 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Thu, 8 Apr 2021 14:36:33 +0100 Message-Id: <20210408133634.16815-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210408133634.16815-1-david.plowman@raspberrypi.com> References: <20210408133634.16815-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/3] ipa: raspberrypi: Add CamHelper::ColourGainCode 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Some sensors may require the V4L2_RED/BLUE_BALANCE to be set. These will require a ColourGainCode method in the CamHelper, analogous to the GainCode method, but which converts the red and blue gains to the codes that the driver will want. Most sensors don't require these values so it's helpful to provide a default method - noting that it should then never be called. Signed-off-by: David Plowman Reviewed-by: Kieran Bingham --- src/ipa/raspberrypi/cam_helper.cpp | 11 +++++++++++ src/ipa/raspberrypi/cam_helper.hpp | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp index 0ae0baa0..556a7c03 100644 --- a/src/ipa/raspberrypi/cam_helper.cpp +++ b/src/ipa/raspberrypi/cam_helper.cpp @@ -57,6 +57,17 @@ double CamHelper::Exposure(uint32_t exposure_lines) const return exposure_lines * mode_.line_length / 1000.0; } +uint32_t CamHelper::ColourGainCode([[maybe_unused]] double gain) const +{ + /* + * This is only used when the sensor has RED/BLUE_BALANCE controls. + * Most do not, so supplying a default is helpful - though no one + * should be calling it. + */ + assert(0); + return 0; +} + uint32_t CamHelper::GetVBlanking(double &exposure, double minFrameDuration, double maxFrameDuration) const { diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index 4053a870..a0b6b987 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -26,7 +26,8 @@ namespace RPiController { // // The ability to convert between number of lines of exposure and actual // exposure time, and to convert between the sensor's gain codes and actual -// gains. +// gains. Some sensors like to be told the colour (red and blue) gains, so +// there's a method for converting these to gain codes too. // // A method to return the number of frames of delay between updating exposure, // analogue gain and vblanking, and for the changes to take effect. For many @@ -72,6 +73,7 @@ public: double maxFrameDuration) const; virtual uint32_t GainCode(double gain) const = 0; virtual double Gain(uint32_t gain_code) const = 0; + virtual uint32_t ColourGainCode(double gain) const; virtual void GetDelays(int &exposure_delay, int &gain_delay, int &vblank_delay) const; virtual bool SensorEmbeddedDataPresent() const;