{"id":15559,"url":"https://patchwork.libcamera.org/api/1.1/patches/15559/?format=json","web_url":"https://patchwork.libcamera.org/patch/15559/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220325103410.38580-4-umang.jain@ideasonboard.com>","date":"2022-03-25T10:34:10","name":"[libcamera-devel,v4,3/3] ipa: ipu3: Ensure controls exists in before they are queried","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5f26986c926e735bdf50df048dc8b50ef7069ab3","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/1.1/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/15559/mbox/","series":[{"id":3001,"url":"https://patchwork.libcamera.org/api/1.1/series/3001/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3001","date":"2022-03-25T10:34:07","name":"ipa: ipu3: Consolidate querying of exposure and gain limits","version":4,"mbox":"https://patchwork.libcamera.org/series/3001/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15559/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15559/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CB008C0F1B\n\tfor ;\n\tFri, 25 Mar 2022 10:34:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8165E604C5;\n\tFri, 25 Mar 2022 11:34:33 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B78EC604C4\n\tfor ;\n\tFri, 25 Mar 2022 11:34:31 +0100 (CET)","from perceval.ideasonboard.com (unknown [103.86.18.118])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DC99D6F3;\n\tFri, 25 Mar 2022 11:34:29 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1648204473;\n\tbh=Yjq93TnpMJ/VWF6HKYm4wDofkiMB1do4fXOKAREtYlI=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=hFjiQE6kc6l2oBQiwQIbbS1dBex+wZwIiGO4USWJlkMj1FQHXBpRoRZhvG0CVVjWh\n\tJrToSMjsWdKvYs3pMDyzwFWElKx5vZLnUcOD/q0bBBwtQlrshIsaxxcaHSlQDarFDb\n\tqV1EORgmy1H/myrBqABI3AeBctACYN2AAAR944w6dp4iHoIMmBHCimGsRugptDzGmg\n\t3fHSTUZT8uJ8hocMggQsJYlDlI4hSeYlrpZl3Hm9jUR4TESU7PJzgH0n2gsIgE7v5K\n\tku6IHEqtFPONcbkeyBfYHqZn8A+PWoYcvHHoZ/gQm0dyQkogwMS4gy/Co3LpAbbyt6\n\tEujF0ED4Hv+BQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1648204471;\n\tbh=Yjq93TnpMJ/VWF6HKYm4wDofkiMB1do4fXOKAREtYlI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=cWqg+n9zLGPHYyCIVJ+arDocFKtrrfEflBKE0nWX1Z/GG14p4DoMSw6jPzjZ6si8o\n\tqGhFIScSutLrzBoiRH3c2Of2aIKOWMgTclljZMCqtjQqQ0pgKwYAZpTr1lAJ163d+n\n\te9c5JNcFfm2UzQ66Rv0DUZ/gx66pzIMSaWAgn8vk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"cWqg+n9z\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Mar 2022 16:04:10 +0530","Message-Id":"<20220325103410.38580-4-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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 3/3] ipa: ipu3: Ensure controls exists\n\tin before they are queried","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Umang Jain via libcamera-devel ","Reply-To":"Umang Jain ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a validation check for sensor controls validateSensorControls()\nbefore they are queried in IPAIPU3::updateSessionConfiguration().\nFail the IPAIPU3::configure() if the required sensor controls are\nnot found.\n\nSigned-off-by: Umang Jain \n---\n src/ipa/ipu3/ipu3.cpp | 28 ++++++++++++++++++++++++++++\n 1 file changed, 28 insertions(+)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 3717d893..50b52d8b 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -155,6 +155,7 @@ private:\n \tvoid parseStatistics(unsigned int frame,\n \t\t\t int64_t frameTimestamp,\n \t\t\t const ipu3_uapi_stats_3a *stats);\n+\tbool validateSensorControls();\n \n \tvoid setControls(unsigned int frame);\n \tvoid calculateBdsGrid(const Size &bdsOutputSize);\n@@ -268,6 +269,28 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t*ipaControls = ControlInfoMap(std::move(controls), controls::controls);\n }\n \n+/**\n+ * \\brief Validate that the sensor controls mandatory for the IPA exists\n+ */\n+bool IPAIPU3::validateSensorControls()\n+{\n+\tstatic const uint32_t ctrls[] = {\n+\t\tV4L2_CID_ANALOGUE_GAIN,\n+\t\tV4L2_CID_EXPOSURE,\n+\t\tV4L2_CID_VBLANK,\n+\t};\n+\n+\tfor (auto c : ctrls) {\n+\t\tif (sensorCtrls_.find(c) == sensorCtrls_.end()) {\n+\t\t\tLOG(IPAIPU3, Error) << \"Unable to find sensor control \"\n+\t\t\t\t\t << utils::hex(c);\n+\t\t\treturn false;\n+\t\t}\n+\t}\n+\n+\treturn true;\n+}\n+\n /**\n * \\brief Initialize the IPA module and its controls\n *\n@@ -433,6 +456,11 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n \t/* Clean frameContext at each reconfiguration. */\n \tcontext_.frameContext = {};\n \n+\tif (!validateSensorControls()) {\n+\t\tLOG(IPAIPU3, Error) << \"Sensor control validation failed.\";\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/* Update the camera controls using the new sensor settings. */\n \tupdateControls(sensorInfo_, sensorCtrls_, ipaControls);\n \n","prefixes":["libcamera-devel","v4","3/3"]}