[{"id":31031,"web_url":"https://patchwork.libcamera.org/comment/31031/","msgid":"<20240901202733.GD7282@pendragon.ideasonboard.com>","date":"2024-09-01T20:27:33","subject":"Re: [PATCH v5 10/18] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Milan,\n\nThank you for the patch.\n\nOn Fri, Aug 30, 2024 at 09:25:46AM +0200, Milan Zamazal wrote:\n> This patch adds Algorithm::queueRequest call for the defined algorithms.\n> As there are currently no control knobs in software ISP nor the\n> corresponding queueRequest call chain, the patch also introduces the\n> queueRequest methods and calls from the pipeline to the IPA.\n> \n> This is preparation only since there are currently no Algorithm based\n> algorithms defined and no current software ISP algorithms support\n> control knobs.\n> \n> Signed-off-by: Milan Zamazal \n> Reviewed-by: Umang Jain \n> Reviewed-by: Daniel Scally \n> ---\n> include/libcamera/internal/software_isp/software_isp.h | 1 +\n> include/libcamera/ipa/soft.mojom | 1 +\n> src/ipa/simple/soft_simple.cpp | 9 +++++++++\n> src/libcamera/pipeline/simple/simple.cpp | 2 ++\n> src/libcamera/software_isp/software_isp.cpp | 10 ++++++++++\n> 5 files changed, 23 insertions(+)\n> \n> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\n> index c5d5a46f..a3e3a9da 100644\n> --- a/include/libcamera/internal/software_isp/software_isp.h\n> +++ b/include/libcamera/internal/software_isp/software_isp.h\n> @@ -73,6 +73,7 @@ public:\n> \tint start();\n> \tvoid stop();\n> \n> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls);\n> \tint queueBuffers(uint32_t frame, FrameBuffer *input,\n> \t\t\t const std::map &outputs);\n> \n> diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\n> index 6b049d20..0ca2869c 100644\n> --- a/include/libcamera/ipa/soft.mojom\n> +++ b/include/libcamera/ipa/soft.mojom\n> @@ -23,6 +23,7 @@ interface IPASoftInterface {\n> \tconfigure(IPAConfigInfo configInfo)\n> \t\t=> (int32 ret);\n> \n> +\t[async] queueRequest(uint32 frame, libcamera.ControlList sensorControls);\n> \t[async] processStats(uint32 frame,\n> uint32 bufferId,\n> libcamera.ControlList sensorControls);\n> diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\n> index 0ea62266..eb3bbd92 100644\n> --- a/src/ipa/simple/soft_simple.cpp\n> +++ b/src/ipa/simple/soft_simple.cpp\n> @@ -78,6 +78,7 @@ public:\n> \tint start() override;\n> \tvoid stop() override;\n> \n> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n> \tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n> \t\t\t const ControlList &sensorControls) override;\n> \n> @@ -270,6 +271,14 @@ void IPASoftSimple::stop()\n> {\n> }\n> \n> +void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &controls)\n> +{\n> +\tIPAFrameContext &frameContext = context_.frameContexts.alloc(frame);\n> +\n> +\tfor (auto const &algo : algorithms())\n> +\t\talgo->queueRequest(context_, frame, frameContext, controls);\n> +}\n> +\n> void IPASoftSimple::processStats([[maybe_unused]] const uint32_t frame,\n> \t\t\t\t [[maybe_unused]] const uint32_t bufferId,\n> \t\t\t\t const ControlList &sensorControls)\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 834b33d9..ed50ab52 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -1428,6 +1428,8 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n> \tif (data->useConversion_)\n> \t\tdata->conversionQueue_.push(std::move(buffers));\n> \n> +\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n\nThis will crash if the soft ISP isn't enabled. With this fixed,\n\nReviewed-by: Laurent Pinchart \n\n> +\n> \treturn 0;\n> }\n> \n> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\n> index 8f1c0f65..eda18947 100644\n> --- a/src/libcamera/software_isp/software_isp.cpp\n> +++ b/src/libcamera/software_isp/software_isp.cpp\n> @@ -278,6 +278,16 @@ int SoftwareIsp::exportBuffers(const Stream *stream, unsigned int count,\n> \treturn count;\n> }\n> \n> +/**\n> + * \\brief Queue a request and process the control list from the application\n> + * \\param[in] frame The number of the frame which will be processed next\n> + * \\param[in] controls The controls for the \\a frame\n> + */\n> +void SoftwareIsp::queueRequest(const uint32_t frame, const ControlList &controls)\n> +{\n> +\tipa_->queueRequest(frame, controls);\n> +}\n> +\n> /**\n> * \\brief Queue buffers to Software ISP\n> * \\param[in] frame The frame number","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 EC6DFC324C\n\tfor ;\n\tSun, 1 Sep 2024 20:28:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1A92C634C8;\n\tSun, 1 Sep 2024 22:28:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9D27163466\n\tfor ;\n\tSun, 1 Sep 2024 22:28:06 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9511251B;\n\tSun, 1 Sep 2024 22:26:55 +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=\"TiPgAe5I\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725222415;\n\tbh=bAA0arAkXPx4spqYJul7xJXct3wM6zJn2FW9eggAzG0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=TiPgAe5I9pW/fRbscdBFdO45IngsjqIt0EBtdJCyd6dGKaTakqsQ0M+zYTg4W+F/P\n\tIMDg1rwyRvz3znnAfcj38W7+SbA5J8KxELoheBaINnZtFhcvOeZOTy/o0lm+wQgds0\n\tyR1ouPIUVj9XdpdzFlQIXoRWAR3msFgemTGrIqvI=","Date":"Sun, 1 Sep 2024 23:27:33 +0300","From":"Laurent Pinchart ","To":"Milan Zamazal ","Cc":"libcamera-devel@lists.libcamera.org,\n\tUmang Jain ,\n\tDaniel Scally ","Subject":"Re: [PATCH v5 10/18] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","Message-ID":"<20240901202733.GD7282@pendragon.ideasonboard.com>","References":"<20240830072554.180672-1-mzamazal@redhat.com>\n\t<20240830072554.180672-11-mzamazal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240830072554.180672-11-mzamazal@redhat.com>","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\" "}}]