{"id":14141,"url":"https://patchwork.libcamera.org/api/1.1/patches/14141/?format=json","web_url":"https://patchwork.libcamera.org/patch/14141/","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":"<20211014174208.50509-6-jacopo@jmondi.org>","date":"2021-10-14T17:41:57","name":"[libcamera-devel,v4,05/16] ipa: ipu3: Update camera controls in configure()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"45b7f557d213a02e95fcb27ff5606f2ce6552c48","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14141/mbox/","series":[{"id":2628,"url":"https://patchwork.libcamera.org/api/1.1/series/2628/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2628","date":"2021-10-14T17:41:52","name":"IPU3 control info update and HAL frame durations","version":4,"mbox":"https://patchwork.libcamera.org/series/2628/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14141/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14141/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 C609EC323E\n\tfor ;\n\tThu, 14 Oct 2021 17:41:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A0D7068F56;\n\tThu, 14 Oct 2021 19:41:32 +0200 (CEST)","from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 573BF68541\n\tfor ;\n\tThu, 14 Oct 2021 19:41:29 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 36F5EFF805;\n\tThu, 14 Oct 2021 17:41:28 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 14 Oct 2021 19:41:57 +0200","Message-Id":"<20211014174208.50509-6-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.33.0","In-Reply-To":"<20211014174208.50509-1-jacopo@jmondi.org>","References":"<20211014174208.50509-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 05/16] ipa: ipu3: Update camera\n\tcontrols in configure()","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When a new CameraConfiguration is applied to the Camera the IPA is\nconfigured as well, using the newly applied sensor configuration and its\nupdated V4L2 controls.\n\nAlso update the Camera controls at IPA::configure() time by re-computing\nthe controls::ExposureTime and controls::FrameDurationLimits limits and\nupdate the controls on the pipeline handler side after having configured\nthe IPA.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Paul Elder \nReviewed-by: Umang Jain \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/ipa/ipu3.mojom | 3 +-\n src/ipa/ipu3/ipu3.cpp | 82 +++++++++++++++++++---------\n src/libcamera/pipeline/ipu3/ipu3.cpp | 4 +-\n 3 files changed, 60 insertions(+), 29 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex 2045ce909a88..2f254ed4193e 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -45,7 +45,8 @@ interface IPAIPU3Interface {\n \tstart() => (int32 ret);\n \tstop();\n \n-\tconfigure(IPAConfigInfo configInfo) => (int32 ret);\n+\tconfigure(IPAConfigInfo configInfo)\n+\t\t=> (int32 ret, libcamera.ControlInfoMap ipaControls);\n \n \tmapBuffers(array buffers);\n \tunmapBuffers(array ids);\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 6d9bbf391cb2..388f1902bcab 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -171,13 +171,17 @@ public:\n \tint start() override;\n \tvoid stop() override {}\n \n-\tint configure(const IPAConfigInfo &configInfo) override;\n+\tint configure(const IPAConfigInfo &configInfo,\n+\t\t ControlInfoMap *ipaControls) override;\n \n \tvoid mapBuffers(const std::vector &buffers) override;\n \tvoid unmapBuffers(const std::vector &ids) override;\n \tvoid processEvent(const IPU3Event &event) override;\n \n private:\n+\tvoid updateControls(const IPACameraSensorInfo &sensorInfo,\n+\t\t\t const ControlInfoMap &sensorControls,\n+\t\t\t ControlInfoMap *ipaControls);\n \tvoid processControls(unsigned int frame, const ControlList &controls);\n \tvoid fillParams(unsigned int frame, ipu3_uapi_params *params);\n \tvoid parseStatistics(unsigned int frame,\n@@ -212,36 +216,30 @@ private:\n \tstruct IPAContext context_;\n };\n \n-/**\n- * Initialize the IPA module and its controls.\n+\n+/*\n+ * Compute camera controls using the sensor information and the sensor\n+ * v4l2 controls.\n *\n- * This function receives the camera sensor information from the pipeline\n- * handler, computes the limits of the controls it handles and returns\n- * them in the \\a ipaControls output parameter.\n+ * Some of the camera controls are computed by the pipeline handler, some others\n+ * by the IPA module which is in charge of handling, for example, the exposure\n+ * time and the frame duration.\n+ *\n+ * This function computes:\n+ * - controls::ExposureTime\n+ * - controls::FrameDurationLimits\n */\n-int IPAIPU3::init(const IPASettings &settings,\n-\t\t const IPACameraSensorInfo &sensorInfo,\n-\t\t const ControlInfoMap &sensorControls,\n-\t\t ControlInfoMap *ipaControls)\n+void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,\n+\t\t\t const ControlInfoMap &sensorControls,\n+\t\t\t ControlInfoMap *ipaControls)\n {\n-\tcamHelper_ = CameraSensorHelperFactory::create(settings.sensorModel);\n-\tif (camHelper_ == nullptr) {\n-\t\tLOG(IPAIPU3, Error)\n-\t\t\t<< \"Failed to create camera sensor helper for \"\n-\t\t\t<< settings.sensorModel;\n-\t\treturn -ENODEV;\n-\t}\n-\n-\t/* Initialize Controls. */\n \tControlInfoMap::Map controls{};\n \n \t/*\n-\t * Compute exposure time limits.\n-\t *\n-\t * Initialize the control using the line length and pixel rate of the\n-\t * current configuration converted to microseconds. Use the\n-\t * V4L2_CID_EXPOSURE control to get exposure min, max and default and\n-\t * convert it from lines to microseconds.\n+\t * Compute exposure time limits by using line length and pixel rate\n+\t * converted to microseconds. Use the V4L2_CID_EXPOSURE control to get\n+\t * exposure min, max and default and convert it from lines to\n+\t * microseconds.\n \t */\n \tdouble lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);\n \tconst ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;\n@@ -279,6 +277,27 @@ int IPAIPU3::init(const IPASettings &settings,\n \t\t\t\t\t\t\t frameDurations[2]);\n \n \t*ipaControls = ControlInfoMap(std::move(controls), controls::controls);\n+}\n+\n+/**\n+ * Initialize the IPA module and its controls.\n+ *\n+ * This function receives the camera sensor information from the pipeline\n+ * handler, computes the limits of the controls it handles and returns\n+ * them in the \\a ipaControls output parameter.\n+ */\n+int IPAIPU3::init(const IPASettings &settings,\n+\t\t const IPACameraSensorInfo &sensorInfo,\n+\t\t const ControlInfoMap &sensorControls,\n+\t\t ControlInfoMap *ipaControls)\n+{\n+\tcamHelper_ = CameraSensorHelperFactory::create(settings.sensorModel);\n+\tif (camHelper_ == nullptr) {\n+\t\tLOG(IPAIPU3, Error)\n+\t\t\t<< \"Failed to create camera sensor helper for \"\n+\t\t\t<< settings.sensorModel;\n+\t\treturn -ENODEV;\n+\t}\n \n \t/* Construct our Algorithms */\n \talgorithms_.push_back(std::make_unique());\n@@ -286,6 +305,9 @@ int IPAIPU3::init(const IPASettings &settings,\n \talgorithms_.push_back(std::make_unique());\n \talgorithms_.push_back(std::make_unique());\n \n+\t/* Initialize controls. */\n+\tupdateControls(sensorInfo, sensorControls, ipaControls);\n+\n \treturn 0;\n }\n \n@@ -365,7 +387,8 @@ void IPAIPU3::calculateBdsGrid(const Size &bdsOutputSize)\n \t\t\t << (int)bdsGrid.height << \" << \" << (int)bdsGrid.block_height_log2 << \")\";\n }\n \n-int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n+int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n+\t\t ControlInfoMap *ipaControls)\n {\n \tif (configInfo.sensorControls.empty()) {\n \t\tLOG(IPAIPU3, Error) << \"No sensor controls provided\";\n@@ -374,6 +397,10 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n \n \tsensorInfo_ = configInfo.sensorInfo;\n \n+\t/*\n+\t * Compute the sensor V4L2 controls to be used by the algorithms and\n+\t * to be set on the sensor.\n+\t */\n \tctrls_ = configInfo.sensorControls;\n \n \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n@@ -415,6 +442,9 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo)\n \t\t\treturn ret;\n \t}\n \n+\t/* Update the camera controls using the new sensor settings. */\n+\tupdateControls(sensorInfo_, ctrls_, ipaControls);\n+\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex cd71cce42421..8a1aaf02db7c 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -660,14 +660,14 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tconfigInfo.bdsOutputSize = config->imguConfig().bds;\n \tconfigInfo.iif = config->imguConfig().iif;\n \n-\tret = data->ipa_->configure(configInfo);\n+\tret = data->ipa_->configure(configInfo, &data->ipaControls_);\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Failed to configure IPA: \"\n \t\t\t\t << strerror(-ret);\n \t\treturn ret;\n \t}\n \n-\treturn 0;\n+\treturn updateControls(data);\n }\n \n int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n","prefixes":["libcamera-devel","v4","05/16"]}