[{"id":20087,"web_url":"https://patchwork.libcamera.org/comment/20087/","msgid":"","date":"2021-10-06T02:02:33","subject":"Re: [libcamera-devel] [PATCH v2 04/17] ipa: ipu3: Update camera\n\tcontrols in configure()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Tue, Sep 07, 2021 at 09:40:54PM +0200, Jacopo Mondi wrote:\n> When a new CameraConfiguration is applied to the Camera the IPA is\n> configured as well, using the newly applied sensor configuration and its\n> updated V4L2 controls.\n> \n> Also update the Camera controls at IPA::configure() time by re-computing\n> the controls::ExposureTime and controls::FrameDurationLimits limits and\n> update the controls on the pipeline handler side after having configured\n> the IPA.\n> \n> Signed-off-by: Jacopo Mondi \n> Reviewed-by: Paul Elder \n> Reviewed-by: Umang Jain \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(-)\n> \n> diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\n> index d561c2244907..714f58ab8a42 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);\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index c925cf642611..ec75b3ffa305 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -156,13 +156,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> @@ -197,36 +201,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, in example, the exposure\n\ns/in example/for example/\n\n> + * time and the frame duration.\n> + *\n> + * This functions computes:\n\ns/functions/function/\n\nReviewed-by: Laurent Pinchart \n\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> @@ -264,12 +262,36 @@ 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> \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> @@ -335,7 +357,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.entityControls.empty()) {\n> \t\tLOG(IPAIPU3, Error) << \"No controls provided\";\n> @@ -344,6 +367,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.entityControls.at(0);\n> \n> \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n> @@ -385,6 +412,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> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 1c383336e45f..de0adffc965f 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,","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 3661ABDC71\n\tfor ;\n\tWed, 6 Oct 2021 02:02:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B2821691B7;\n\tWed, 6 Oct 2021 04:02:43 +0200 (CEST)","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 CBC616012B\n\tfor ;\n\tWed, 6 Oct 2021 04:02:41 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3965C581;\n\tWed, 6 Oct 2021 04:02:41 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ouaTHhk1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1633485761;\n\tbh=dy4rBNJFbltHWd6nmqmUBrY+G1iA+q9jIjh5KZpkLoE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ouaTHhk1dXtsUPePSZD+YgIcMpINHvDAltPqNRVSR8+q7pB9cyyltHJWuNzJZrqN+\n\t5X5PzUslgVFVAVF5EmWwM8l6hGNzuT272j4dMU7yn3c9fpAvRFwTv+MWKXPPBJ3mKs\n\tHMPMxgn65wGaUbXDvfixHZa0tuMEMBU9B/PDaSiM=","Date":"Wed, 6 Oct 2021 05:02:33 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210907194107.803730-1-jacopo@jmondi.org>\n\t<20210907194107.803730-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210907194107.803730-5-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 04/17] 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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]