From patchwork Fri Jun 11 10:07:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 12569 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 C1820C3214 for ; Fri, 11 Jun 2021 10:07:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 52F4068934; Fri, 11 Jun 2021 12:07:09 +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="qz5QvdHO"; dkim-atps=neutral Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6AC8F6892C for ; Fri, 11 Jun 2021 12:07:08 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id f16-20020a05600c1550b02901b00c1be4abso8321729wmg.2 for ; Fri, 11 Jun 2021 03:07:08 -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=XACfAo3TeGNF0rp/SYZW+awF5o1J3CDFB0MciljeeOQ=; b=qz5QvdHOUGe1IfPGt8bnaBRkzgD5JoJGSk//DmlSH1ufFG3pdMkbMXZO7hSGNFKIGe ess5jQITrVMiupk3fDL4409lo3L0KC7vwIT0T69woQBsPBvZDbUZ4iK3gOA9eAWMCo93 wfgRmfvf/Fcd8KjxZ5YvRYlSwa+Of2OY0NnUbzAHlcXAvp5LmZZTDdLX00TZ5a2758S0 DhVIbpg1H+oi1H1psLsk00arjRF1+SOMV/SiD6fAmtIMhUNUvMhUqutOU7Y8I63gZpwI LCifjxJL6F2Sm3Hon9GT+hNaLfx8fc3XnMMbASDvZ7HoCG9uU4K2UQaYr/HFRwjG4ddg LfhA== 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=XACfAo3TeGNF0rp/SYZW+awF5o1J3CDFB0MciljeeOQ=; b=ZaYKcS6ZGIxTOhRcNc8PbLRqbZO6NQ5ZfLwRjJlJ9/zN998Pp5bV+yFutJ3lfjasVv Ws2S7akucn6jfZJn+EYiX2wJLmIE7gYLrKL3/4yWQxK5Du2QI9e1GFaklLO6XqEAD0fI RmnzM8Jqi6UWuMX8h9Er3B3WACnc9z91/fGmSE3V468kC4mjUcfK3pV7/cTRzKMfuQvp t9x1K5V/aAg2v5t6T5siWMrYnhO2yZDT1hAdopYmtdAKBhqCxfznFcnOD5mjfk7JiFG7 ZE234/eFML7mjFtxi9Yl5s1sb/p9aNCTn5O7Z3cUWDdgIGvlYDbsikpyqxtNuX7J1lWN UgvQ== X-Gm-Message-State: AOAM532QlMpPxSwa9aLEk2MJrZYVGp7zB9NDnBx73FZVFBf+BwHlE/1d sReRG05dh9vX8Dt57y0L8f2U23KEcpgARbuO X-Google-Smtp-Source: ABdhPJwM9Ne/sexF84I3DfjmyrvDEfd8qIm/sObvjMw+VMtx5t/Om4ri/zLR6NjNy4HF4YUS1VcIrw== X-Received: by 2002:a7b:c10b:: with SMTP id w11mr19565668wmi.186.1623406027675; Fri, 11 Jun 2021 03:07:07 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id b135sm12568155wmb.5.2021.06.11.03.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 03:07:07 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Fri, 11 Jun 2021 11:07:02 +0100 Message-Id: <20210611100703.2285-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210611100703.2285-1-david.plowman@raspberrypi.com> References: <20210611100703.2285-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/2] ipa: raspberrypi: Add sensitivity field to camera mode 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" We use the CamHelper class to initialise it to the usual value of 1. The CamHelper's GetModeSensitivity method can be redefined to implement a different behaviour for sensors that require it. Signed-off-by: David Plowman Reviewed-by: Naushir Patuck Acked-by: Kieran Bingham --- src/ipa/raspberrypi/cam_helper.cpp | 11 +++++++++++ src/ipa/raspberrypi/cam_helper.hpp | 3 +++ src/ipa/raspberrypi/controller/camera_mode.h | 2 ++ src/ipa/raspberrypi/raspberrypi.cpp | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp index 062e94c4..d0104da7 100644 --- a/src/ipa/raspberrypi/cam_helper.cpp +++ b/src/ipa/raspberrypi/cam_helper.cpp @@ -130,6 +130,17 @@ bool CamHelper::SensorEmbeddedDataPresent() const return false; } +double CamHelper::GetModeSensitivity([[maybe_unused]] const CameraMode &mode) const +{ + /* + * Most sensors have the same sensitivity in every mode, but this + * method can be overridden for those that do not. Note that it is + * called before mode_ is set, so it must return the sensitivity + * of the mode that is passed in. + */ + return 1.0; +} + unsigned int CamHelper::HideFramesStartup() const { /* diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index f53f5c39..f524fe84 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -40,6 +40,8 @@ namespace RPiController { // // A method to query if the sensor outputs embedded data that can be parsed. // +// A method to return the sensitivity of a given camera mode. +// // A parser to parse the embedded data buffers provided by some sensors (for // example, the imx219 does; the ov5647 doesn't). This allows us to know for // sure the exposure and gain of the frame we're looking at. CamHelper @@ -83,6 +85,7 @@ public: virtual void GetDelays(int &exposure_delay, int &gain_delay, int &vblank_delay) const; virtual bool SensorEmbeddedDataPresent() const; + virtual double GetModeSensitivity(const CameraMode &mode) const; virtual unsigned int HideFramesStartup() const; virtual unsigned int HideFramesModeSwitch() const; virtual unsigned int MistrustFramesStartup() const; diff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h index 2aa2335d..72c68dc6 100644 --- a/src/ipa/raspberrypi/controller/camera_mode.h +++ b/src/ipa/raspberrypi/controller/camera_mode.h @@ -41,6 +41,8 @@ struct CameraMode { libcamera::Transform transform; // minimum and maximum fame lengths in units of lines uint32_t min_frame_length, max_frame_length; + // sensitivity of this mode + double sensitivity; }; #ifdef __cplusplus diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 1c1e802a..9ce0db08 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -324,6 +324,12 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo) */ mode_.min_frame_length = sensorInfo.minFrameLength; mode_.max_frame_length = sensorInfo.maxFrameLength; + + /* + * Some sensors may have different sensitivities in different modes; + * the CamHelper will know the correct value. + */ + mode_.sensitivity = helper_->GetModeSensitivity(mode_); } int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,