From patchwork Thu Mar 24 14:20:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 15539 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 DA59AC0F1B for ; Thu, 24 Mar 2022 14:20:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A1603604D5; Thu, 24 Mar 2022 15:20:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648131658; bh=O79HbxZc3dEQrPzwJu1mlJQvAduOUfEGbfMj49HOlIQ=; 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=mnETLy31HUqIBm7zCMJ7OCxxD5GgazE70RHuhEr52/sjognHP+5Rk+nSCVCC+hhjh qf6opiuqcqkQFZ2wRA71UYZ9s5NOGfWksMZCNebs1GaQ7IeymppPfeF2FFrbSRqm0c lXZEkQMqbP9ET5g/B22Czq/wDFjTrKInlQbjB8s8T4fRlOyYMi7IPTJq32Cl7apLfi X8N9jIXaBRGN4wTaQCzWiXfZeqJsHnzADSIIDGN1JFrcfemjjeGq/K/ctCEqAmlzE0 C81KrzPQLRaV1DXbNTsYLUJ2Vp+vlyoxO9XKVYORtkKZJDaVfpgomVUsb+wHYJfiKI Dmj240Njuny4Q== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 03B6E604C5 for ; Thu, 24 Mar 2022 15:20:57 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Ra9myZ2I"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [103.86.18.100]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 35D4E1844; Thu, 24 Mar 2022 15:20:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648131656; bh=O79HbxZc3dEQrPzwJu1mlJQvAduOUfEGbfMj49HOlIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ra9myZ2IpmXhORTSOS3BRwIisrEPRE/kFOMK9U+nSiVDcS4ssiJJRlXhQrI9JZec3 SAx01Sr/Az0c6GCnuf9jjuvmt05wY7250bU/oEZ33FQ48AtlQj5aVM8C57TPSNPaFQ T0P40cdE9Ssdv5AqAqpACEP5XM179AG9lhksnfvQ= To: libcamera-devel@lists.libcamera.org Date: Thu, 24 Mar 2022 19:50:35 +0530 Message-Id: <20220324142035.47338-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220324142035.47338-1-umang.jain@ideasonboard.com> References: <20220324142035.47338-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/3] ipa: ipu3: Ensure controls exists in updateSessionConfiguration() 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" Add a control-not-found error checking for the controls being queried in IPAIPU3::updateSessionConfiguration(). If the control is not found, progagate the error back to the caller. This requires a change in the function signature of private member function IPAIPU3::updateSessionConfiguration(). Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/ipa/ipu3/ipu3.cpp | 44 +++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 3717d893..66346728 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -149,7 +149,7 @@ private: void updateControls(const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls, ControlInfoMap *ipaControls); - void updateSessionConfiguration(const ControlInfoMap &sensorControls); + int updateSessionConfiguration(const ControlInfoMap &sensorControls); void processControls(unsigned int frame, const ControlList &controls); void fillParams(unsigned int frame, ipu3_uapi_params *params); void parseStatistics(unsigned int frame, @@ -180,18 +180,33 @@ private: * \brief Compute IPASessionConfiguration using the sensor information and the * sensor V4L2 controls */ -void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls) +int IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls) { - const ControlInfo vBlank = sensorControls.find(V4L2_CID_VBLANK)->second; - context_.configuration.sensor.defVBlank = vBlank.def().get(); + const auto itVBlank = sensorControls.find(V4L2_CID_VBLANK); + if (itVBlank == sensorControls.end()) { + LOG(IPAIPU3, Error) << "Can't find vblank control"; + return -EINVAL; + } - const ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second; - int32_t minExposure = v4l2Exposure.min().get(); - int32_t maxExposure = v4l2Exposure.max().get(); + context_.configuration.sensor.defVBlank = itVBlank->second.def().get(); + + const auto itExp = sensorControls.find(V4L2_CID_EXPOSURE); + if (itExp == sensorControls.end()) { + LOG(IPAIPU3, Error) << "Can't find exposure control"; + return -EINVAL; + } + + int32_t minExposure = itExp->second.min().get(); + int32_t maxExposure = itExp->second.max().get(); - const ControlInfo &v4l2Gain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN)->second; - int32_t minGain = v4l2Gain.min().get(); - int32_t maxGain = v4l2Gain.max().get(); + const auto itGain = sensorControls.find(V4L2_CID_ANALOGUE_GAIN); + if (itGain == sensorControls.end()) { + LOG(IPAIPU3, Error) << "Can't find analogue gain control"; + return -EINVAL; + } + + int32_t minGain = itGain->second.min().get(); + int32_t maxGain = itGain->second.max().get(); /* * When the AGC computes the new exposure values for a frame, it needs @@ -204,6 +219,8 @@ void IPAIPU3::updateSessionConfiguration(const ControlInfoMap &sensorControls) context_.configuration.agc.maxShutterSpeed = maxExposure * context_.configuration.sensor.lineDuration; context_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain); context_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain); + + return 0; } /** @@ -437,10 +454,13 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo, updateControls(sensorInfo_, sensorCtrls_, ipaControls); /* Update the IPASessionConfiguration using the sensor settings. */ - updateSessionConfiguration(sensorCtrls_); + int ret = updateSessionConfiguration(sensorCtrls_); + if (ret < 0) + return ret; + for (auto const &algo : algorithms_) { - int ret = algo->configure(context_, configInfo); + ret = algo->configure(context_, configInfo); if (ret) return ret; }