From patchwork Fri Mar 25 10:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 15557 X-Patchwork-Delegate: umang.jain@ideasonboard.com 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 08C9BC0F1B for ; Fri, 25 Mar 2022 10:34:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B9172604DA; Fri, 25 Mar 2022 11:34:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648204466; bh=CWCgDwq3yshEtyjzPFYlN0WK59H01hX8UnTa8DWZ010=; 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=CW5Fz4cPC/YyJHW0qixsQjnV3YjRQWWNm8QOxZJ9FgFqJuzRdlAdQJWyZafs6R1JE X7uQ+eRG0RIc56/ioF9BQFh092rqIeQnVoLvJcnAGK8++REB+OPV5FqJ1c8yPRkt+9 dyqIMnhbhVRO9i1Iv7v7gciK02WlB9RthPjWE+IUume/6OReEz1hOEVIjwF/dx80t1 arQlNCNIP3SXnJ6fda+wfZVUAGUEsLhC/hD9NDOIjyFtyNpfJ4YWL2tslUohc6wpuA sTw4OZMoafwP7RiApTjiIrnnHnpNN5uxEwfg0+7lAicraOMxriN/Auq0mX8hPac5c8 lcezqWJQ3DyVw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C874E604C4 for ; Fri, 25 Mar 2022 11:34:24 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jVg4vWKE"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [103.86.18.118]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4F6986F3; Fri, 25 Mar 2022 11:34:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648204464; bh=CWCgDwq3yshEtyjzPFYlN0WK59H01hX8UnTa8DWZ010=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jVg4vWKEN9+5gzGfXtUQqFK0t9z1kwh62sAJRbBnk8GwJhYLAlG7FKxNCCRwhMvsP s1MtydqAOkl+whdTfyA8T4rHSb6MlMEXe3MwczTShTQL0FLhH3W7R1bb6lplGDJQZx bqllCP8Lse0CW7JTFXTW7SESBYMkmcTzYIy20wT8= To: libcamera-devel@lists.libcamera.org Date: Fri, 25 Mar 2022 16:04:08 +0530 Message-Id: <20220325103410.38580-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220325103410.38580-1-umang.jain@ideasonboard.com> References: <20220325103410.38580-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 1/3] ipa: ipu3: Consolidate querying of exposure and gain limits 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: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The exposure and gain limits are required for AGC configuration handled in IPAIPU3::updateSessionConfiguration(), which is happening already. Therefore the max/min private members in IPAIPU3 class for exposure/gain serve no use except setting initial values of exposure_ and gain_ members. Drop the max/min private members from IPAIPU3 class and set initial gain_ and exposure_ in IPAIPU3::updateSessionConfiguration(). Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/ipa/ipu3/ipu3.cpp | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 1ea2c898..a8cc2f6c 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -169,11 +169,7 @@ private: /* Camera sensor controls. */ uint32_t defVBlank_; uint32_t exposure_; - uint32_t minExposure_; - uint32_t maxExposure_; uint32_t gain_; - uint32_t minGain_; - uint32_t maxGain_; /* Interface to the Camera Helper */ std::unique_ptr camHelper_; @@ -194,10 +190,12 @@ void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls) const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second; int32_t minExposure = v4l2Exposure.min().get(); int32_t maxExposure = v4l2Exposure.max().get(); + exposure_ = minExposure; const ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second; int32_t minGain = v4l2Gain.min().get(); int32_t maxGain = v4l2Gain.max().get(); + gain_ = minGain; /* * When the AGC computes the new exposure values for a frame, it needs @@ -434,32 +432,12 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo, */ sensorCtrls_ = configInfo.sensorControls; - const auto itExp = sensorCtrls_.find(V4L2_CID_EXPOSURE); - if (itExp == sensorCtrls_.end()) { - LOG(IPAIPU3, Error) << "Can't find exposure control"; - return -EINVAL; - } - - const auto itGain = sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN); - if (itGain == sensorCtrls_.end()) { - LOG(IPAIPU3, Error) << "Can't find gain control"; - return -EINVAL; - } - const auto itVBlank = sensorCtrls_.find(V4L2_CID_VBLANK); if (itVBlank == sensorCtrls_.end()) { LOG(IPAIPU3, Error) << "Can't find VBLANK control"; return -EINVAL; } - minExposure_ = itExp->second.min().get(); - maxExposure_ = itExp->second.max().get(); - exposure_ = minExposure_; - - minGain_ = itGain->second.min().get(); - maxGain_ = itGain->second.max().get(); - gain_ = minGain_; - defVBlank_ = itVBlank->second.def().get(); calculateBdsGrid(configInfo.bdsOutputSize);