{"id":13030,"url":"https://patchwork.libcamera.org/api/patches/13030/?format=json","web_url":"https://patchwork.libcamera.org/patch/13030/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210716143215.67454-2-jacopo@jmondi.org>","date":"2021-07-16T14:32:14","name":"[libcamera-devel,1/2] libcamera: ipu3: Initialize controls in the IPA","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e12207e1b992ee08eb097c249feea9d532fea5d5","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13030/mbox/","series":[{"id":2246,"url":"https://patchwork.libcamera.org/api/series/2246/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2246","date":"2021-07-16T14:32:13","name":"libcamera: Initialize controls in the IPA","version":1,"mbox":"https://patchwork.libcamera.org/series/2246/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13030/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13030/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 1B462C3229\n\tfor ;\n\tFri, 16 Jul 2021 14:31:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AFAE76853A;\n\tFri, 16 Jul 2021 16:31:34 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 820F668536\n\tfor ;\n\tFri, 16 Jul 2021 16:31:32 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 0F58A24000B;\n\tFri, 16 Jul 2021 14:31:31 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 16 Jul 2021 16:32:14 +0200","Message-Id":"<20210716143215.67454-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210716143215.67454-1-jacopo@jmondi.org>","References":"<20210716143215.67454-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] libcamera: ipu3: Initialize controls\n\tin the IPA","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":"All the IPU3 Camera controls are currently initialized by the pipeline\nhandler which initializes them using the camera sensor configuration and\nplatform specific requirements.\n\nHowever, some controls are better initialized by the IPA, which might,\nin example, cap the exposure times and frame duration to the constraints\nof its algorithms implementation.\n\nAlso, moving forward, the IPA should register controls to report its\ncapabilities, in example the ability to enable/disable 3A algorithms on\nrequest.\n\nMove the existing controls initialization to the IPA, by providing\nthe sensor configuration and its controls to the IPU3IPA::init()\nfunction, which initializes controls and returns them to the pipeline\nthrough an output parameter.\n\nThe existing controls initialization has been copied verbatim from the\npipeline handler to the IPA, if not a for few line breaks adjustments\nand the resulting Camera controls values are not changed .\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/ipa/ipu3.mojom | 8 ++-\n src/ipa/ipu3/ipu3.cpp | 71 ++++++++++++++++++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 96 ++++++++++++----------------\n 3 files changed, 116 insertions(+), 59 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom\nindex 911a3a072464..eafefa8b7fe3 100644\n--- a/include/libcamera/ipa/ipu3.mojom\n+++ b/include/libcamera/ipa/ipu3.mojom\n@@ -30,6 +30,11 @@ struct IPU3Action {\n \tlibcamera.ControlList controls;\n };\n \n+struct IPAInitInfo {\n+\tlibcamera.IPACameraSensorInfo sensorInfo;\n+\tlibcamera.ControlInfoMap sensorControls;\n+};\n+\n struct IPAConfigInfo {\n \tlibcamera.IPACameraSensorInfo sensorInfo;\n \tmap entityControls;\n@@ -38,7 +43,8 @@ struct IPAConfigInfo {\n };\n \n interface IPAIPU3Interface {\n-\tinit(libcamera.IPASettings settings) => (int32 ret);\n+\tinit(IPAInitInfo initInfo)\n+\t\t=> (int32 ret, libcamera.ControlInfoMap ipaControls);\n \tstart() => (int32 ret);\n \tstop();\n \ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 71698d36e50f..d3c69bc07bd0 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -5,8 +5,10 @@\n * ipu3.cpp - IPU3 Image Processing Algorithms\n */\n \n+#include \n #include \n #include \n+#include \n \n #include \n #include \n@@ -38,7 +40,8 @@ namespace ipa::ipu3 {\n class IPAIPU3 : public IPAIPU3Interface\n {\n public:\n-\tint init(const IPASettings &settings) override;\n+\tint init(const IPAInitInfo &initInfo, ControlInfoMap *ipaControls) override;\n+\n \tint start() override;\n \tvoid stop() override {}\n \n@@ -86,14 +89,74 @@ private:\n \tstruct ipu3_uapi_grid_config bdsGrid_;\n };\n \n-int IPAIPU3::init(const IPASettings &settings)\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 IPAInitInfo &initInfo, ControlInfoMap *ipaControls)\n {\n-\tcamHelper_ = CameraSensorHelperFactory::create(settings.sensorModel);\n+\tconst IPACameraSensorInfo &sensorInfo = initInfo.sensorInfo;\n+\n+\t/* Initialize the camera sensor helper. */\n+\tcamHelper_ = CameraSensorHelperFactory::create(sensorInfo.model);\n \tif (camHelper_ == nullptr) {\n-\t\tLOG(IPAIPU3, Error) << \"Failed to create camera sensor helper for \" << settings.sensorModel;\n+\t\tLOG(IPAIPU3, Error) << \"Failed to create camera sensor helper for \"\n+\t\t\t\t << sensorInfo.model;\n \t\treturn -ENODEV;\n \t}\n \n+\t/* Initialize Controls. */\n+\tconst ControlInfoMap &sensorControls = initInfo.sensorControls;\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 */\n+\tdouble lineDuration = sensorInfo.lineLength / (sensorInfo.pixelRate / 1e6);\n+\tconst ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;\n+\tint32_t minExposure = v4l2Exposure.min().get() * lineDuration;\n+\tint32_t maxExposure = v4l2Exposure.max().get() * lineDuration;\n+\tint32_t defExposure = v4l2Exposure.def().get() * lineDuration;\n+\tcontrols[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,\n+\t\t\t\t\t\t\tdefExposure);\n+\n+\t/*\n+\t * Compute the frame duration limits.\n+\t *\n+\t * The frame length is computed assuming a fixed line length combined\n+\t * with the vertical frame sizes.\n+\t */\n+\tconst ControlInfo &v4l2HBlank = sensorControls.find(V4L2_CID_HBLANK)->second;\n+\tuint32_t hblank = v4l2HBlank.def().get();\n+\tuint32_t lineLength = sensorInfo.outputSize.width + hblank;\n+\n+\tconst ControlInfo &v4l2VBlank = sensorControls.find(V4L2_CID_VBLANK)->second;\n+\tstd::array frameHeights{\n+\t\tv4l2VBlank.min().get() + sensorInfo.outputSize.height,\n+\t\tv4l2VBlank.max().get() + sensorInfo.outputSize.height,\n+\t\tv4l2VBlank.def().get() + sensorInfo.outputSize.height,\n+\t};\n+\n+\tstd::array frameDurations;\n+\tfor (unsigned int i = 0; i < frameHeights.size(); ++i) {\n+\t\tuint64_t frameSize = lineLength * frameHeights[i];\n+\t\tframeDurations[i] = frameSize / (sensorInfo.pixelRate / 1000000U);\n+\t}\n+\n+\tcontrols[&controls::FrameDurationLimits] = ControlInfo(frameDurations[0],\n+\t\t\t\t\t\t\t frameDurations[1],\n+\t\t\t\t\t\t\t frameDurations[2]);\n+\n+\t*ipaControls = std::move(controls);\n+\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 76c3bb3d8aa9..22df9c3650af 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -88,6 +88,8 @@ public:\n \n \tstd::queue pendingRequests_;\n \n+\tControlInfoMap ipaControls_;\n+\n private:\n \tvoid queueFrameAction(unsigned int id,\n \t\t\t const ipa::ipu3::IPU3Action &action);\n@@ -940,7 +942,6 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n \t\treturn ret;\n \n \tControlInfoMap::Map controls = IPU3Controls;\n-\tconst ControlInfoMap &sensorControls = sensor->controls();\n \tconst std::vector &testPatternModes = sensor->testPatternModes();\n \tif (!testPatternModes.empty()) {\n \t\tstd::vector values;\n@@ -952,58 +953,6 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n \t\tcontrols[&controls::draft::TestPatternMode] = ControlInfo(values);\n \t}\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 */\n-\tdouble lineDuration = sensorInfo.lineLength\n-\t\t\t / (sensorInfo.pixelRate / 1e6);\n-\tconst ControlInfo &v4l2Exposure = sensorControls.find(V4L2_CID_EXPOSURE)->second;\n-\tint32_t minExposure = v4l2Exposure.min().get() * lineDuration;\n-\tint32_t maxExposure = v4l2Exposure.max().get() * lineDuration;\n-\tint32_t defExposure = v4l2Exposure.def().get() * lineDuration;\n-\n-\t/*\n-\t * \\todo Report the actual exposure time, use the default for the\n-\t * moment.\n-\t */\n-\tdata->exposureTime_ = defExposure;\n-\n-\tcontrols[&controls::ExposureTime] = ControlInfo(minExposure, maxExposure,\n-\t\t\t\t\t\t\tdefExposure);\n-\n-\t/*\n-\t * Compute the frame duration limits.\n-\t *\n-\t * The frame length is computed assuming a fixed line length combined\n-\t * with the vertical frame sizes.\n-\t */\n-\tconst ControlInfo &v4l2HBlank = sensorControls.find(V4L2_CID_HBLANK)->second;\n-\tuint32_t hblank = v4l2HBlank.def().get();\n-\tuint32_t lineLength = sensorInfo.outputSize.width + hblank;\n-\n-\tconst ControlInfo &v4l2VBlank = sensorControls.find(V4L2_CID_VBLANK)->second;\n-\tstd::array frameHeights{\n-\t\tv4l2VBlank.min().get() + sensorInfo.outputSize.height,\n-\t\tv4l2VBlank.max().get() + sensorInfo.outputSize.height,\n-\t\tv4l2VBlank.def().get() + sensorInfo.outputSize.height,\n-\t};\n-\n-\tstd::array frameDurations;\n-\tfor (unsigned int i = 0; i < frameHeights.size(); ++i) {\n-\t\tuint64_t frameSize = lineLength * frameHeights[i];\n-\t\tframeDurations[i] = frameSize / (sensorInfo.pixelRate / 1000000U);\n-\t}\n-\n-\tcontrols[&controls::FrameDurationLimits] =\n-\t\tControlInfo(frameDurations[0],\n-\t\t\t frameDurations[1],\n-\t\t\t frameDurations[2]);\n-\n \t/*\n \t * Compute the scaler crop limits.\n \t *\n@@ -1057,6 +1006,10 @@ int PipelineHandlerIPU3::initControls(IPU3CameraData *data)\n \n \tcontrols[&controls::ScalerCrop] = ControlInfo(minCrop, maxCrop, maxCrop);\n \n+\t/* Add the IPA registered controls to list of camera controls. */\n+\tfor (const auto &ipaControl : data->ipaControls_)\n+\t\tcontrols[ipaControl.first] = ipaControl.second;\n+\n \tdata->controlInfo_ = std::move(controls);\n \n \treturn 0;\n@@ -1208,13 +1161,48 @@ int IPU3CameraData::loadIPA()\n \n \tipa_->queueFrameAction.connect(this, &IPU3CameraData::queueFrameAction);\n \n+\t/*\n+\t * Pass the sensor info the the IPA to initialize controls.\n+\t *\n+\t * \\todo The limits of the registered controls depend on the current\n+\t * sensor configuration. Initialize the sensor using its resolution as\n+\t * its initial configuration and use it to compute the controls limits\n+\t * in the IPA.\n+\t */\n \tCameraSensor *sensor = cio2_.sensor();\n-\tint ret = ipa_->init(IPASettings{ \"\", sensor->model() });\n+\tV4L2SubdeviceFormat sensorFormat = {};\n+\tsensorFormat.size = sensor->resolution();\n+\tint ret = sensor->setFormat(&sensorFormat);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tIPACameraSensorInfo sensorInfo{};\n+\tret = sensor->sensorInfo(&sensorInfo);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tipa::ipu3::IPAInitInfo initInfo{\n+\t\tsensorInfo,\n+\t\tsensor->controls(),\n+\t};\n+\tipaControls_ = {};\n+\tret = ipa_->init(initInfo, &ipaControls_);\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Failed to initialise the IPU3 IPA\";\n \t\treturn ret;\n \t}\n \n+\t/*\n+\t * \\todo Report the actual exposure time, use the default for the\n+\t * moment.\n+\t */\n+\tconst auto exposureInfo = ipaControls_.find(&controls::ExposureTime);\n+\tif (exposureInfo == ipaControls_.end()) {\n+\t\tLOG(IPU3, Error) << \"Exposure control not initializaed by the IPA\";\n+\t\treturn -EINVAL;\n+\t}\n+\texposureTime_ = exposureInfo->second.def().get();\n+\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel","1/2"]}