[{"id":37861,"web_url":"https://patchwork.libcamera.org/comment/37861/","msgid":"<176907345374.3882822.3463635321837008359@neptunite.rasen.tech>","date":"2026-01-22T09:17:33","subject":"Re: [PATCH v1 30/35] pipeline: rkisp1: Correctly handle params\n\tbuffer for frame 0","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Quoting Stefan Klug (2025-10-24 17:50:54)\n> The parameters for frame 0 are only active on frame 0 if the\n> corresponding parameter buffer is queued before STREAMON is called on\n> the isp. Therefore the normal mechanics of calling ipa->computeParams()\n> do not work, as it gets called after the first request is queued and\n> therefore the isp is already started. To fix that, handle the parameter\n> buffer the same way the initial sensor controls are handled by passing\n> it to the ipa->start() function and then queuing the params buffer\n> before starting the isp.\n> \n> Signed-off-by: Stefan Klug \n\nLooks good to me.\n\nReviewed-by: Paul Elder \n\n> ---\n> include/libcamera/ipa/rkisp1.mojom | 5 +++-\n> src/ipa/rkisp1/rkisp1.cpp | 31 +++++++++++++++++-------\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 31 ++++++++++++++++++------\n> 3 files changed, 49 insertions(+), 18 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index 4c29b53cd7f9..56c9fe8ab92a 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -17,6 +17,7 @@ struct IPAConfigInfo {\n> struct StartResult {\n> libcamera.ControlList controls;\n> int32 code;\n> + uint32 paramBufferBytesUsed;\n> };\n> \n> interface IPARkISP1Interface {\n> @@ -25,7 +26,9 @@ interface IPARkISP1Interface {\n> libcamera.IPACameraSensorInfo sensorInfo,\n> libcamera.ControlInfoMap sensorControls)\n> => (int32 ret, libcamera.ControlInfoMap ipaControls);\n> - start(libcamera.ControlList controls) => (StartResult result);\n> + start(libcamera.ControlList controls,\n> + uint32 paramBufferId)\n> + => (StartResult result);\n> stop();\n> \n> configure(IPAConfigInfo configInfo,\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index b714e2f10c65..a887214c63a9 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -56,7 +56,8 @@ public:\n> const IPACameraSensorInfo &sensorInfo,\n> const ControlInfoMap &sensorControls,\n> ControlInfoMap *ipaControls) override;\n> - void start(const ControlList &controls, StartResult *result) override;\n> + void start(const ControlList &controls, const uint32_t paramBufferId,\n> + StartResult *result) override;\n> void stop() override;\n> \n> int configure(const IPAConfigInfo &ipaConfig,\n> @@ -77,6 +78,8 @@ protected:\n> std::string logPrefix() const override;\n> \n> private:\n> + uint32_t computeParamsInternal(IPAFrameContext &frameContext, const uint32_t bufferId);\n> +\n> void updateControls(const IPACameraSensorInfo &sensorInfo,\n> const ControlInfoMap &sensorControls,\n> ControlInfoMap *ipaControls);\n> @@ -216,10 +219,12 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n> return 0;\n> }\n> \n> -void IPARkISP1::start(const ControlList &controls, StartResult *result)\n> +void IPARkISP1::start(const ControlList &controls, const uint32_t paramBufferId,\n> + StartResult *result)\n> {\n> IPAFrameContext frameContext = {};\n> initializeFrameContext(0, frameContext, controls);\n> + result->paramBufferBytesUsed = computeParamsInternal(frameContext, paramBufferId);\n> result->controls = getSensorControls(frameContext);\n> result->code = 0;\n> }\n> @@ -373,6 +378,19 @@ void IPARkISP1::initializeFrameContext(const uint32_t frame,\n> controlsToApply_.clear();\n> }\n> \n> +uint32_t IPARkISP1::computeParamsInternal(IPAFrameContext &frameContext, const uint32_t bufferId)\n> +{\n> + ASSERT(bufferId);\n> +\n> + RkISP1Params params(context_.configuration.paramFormat,\n> + mappedBuffers_.at(bufferId).planes()[0]);\n> +\n> + for (auto const &algo : algorithms())\n> + algo->prepare(context_, frameContext.frame(), frameContext, ¶ms);\n> +\n> + return params.size();\n> +}\n> +\n> void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)\n> {\n> IPAFrameContext &frameContext = context_.frameContexts.get(frame);\n> @@ -390,16 +408,11 @@ void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)\n> return;\n> }\n> \n> - RkISP1Params params(context_.configuration.paramFormat,\n> - mappedBuffers_.at(bufferId).planes()[0]);\n> -\n> - for (auto const &algo : algorithms())\n> - algo->prepare(context_, frame, frameContext, ¶ms);\n> -\n> + uint32_t size = computeParamsInternal(frameContext, bufferId);\n> ControlList ctrls = getSensorControls(frameContext);\n> setSensorControls.emit(frame, ctrls);\n> \n> - paramsComputed.emit(frame, params.size());\n> + paramsComputed.emit(frame, size);\n> }\n> \n> void IPARkISP1::processStats(const uint32_t frame, const uint32_t bufferId,\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 2d78721be63a..1e39acc5cc37 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -110,8 +110,8 @@ public:\n> bool canUseDewarper_;\n> bool usesDewarper_;\n> \n> -private:\n> void paramsComputed(unsigned int frame, unsigned int bytesused);\n> +private:\n> void setSensorControls(unsigned int frame,\n> const ControlList &sensorControls);\n> \n> @@ -1251,23 +1251,38 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n> if (!!controls)\n> ctrls = *controls;\n> \n> + data->frame_ = 0;\n> + nextParamsSequence_ = 0;\n> + nextStatsToProcess_ = 0;\n> + paramsSyncHelper_.reset();\n> + imageSyncHelper_.reset();\n> +\n> + uint32_t paramBufferId = 0;\n> + FrameBuffer *paramBuffer = nullptr;\n> + if (!isRaw_) {\n> + paramBuffer = availableParamBuffers_.front();\n> + paramBufferId = paramBuffer->cookie();\n> + }\n> +\n> ipa::rkisp1::StartResult res;\n> - data->ipa_->start(ctrls, &res);\n> + data->ipa_->start(ctrls, paramBufferId, &res);\n> if (res.code) {\n> LOG(RkISP1, Error)\n> << \"Failed to start IPA \" << camera->id();\n> return ret;\n> }\n> +\n> + if (paramBuffer) {\n> + availableParamBuffers_.pop();\n> + computingParamBuffers_.push({ paramBuffer, nextParamsSequence_++ });\n> + paramsSyncHelper_.pushCorrection(0);\n> + data->paramsComputed(0, res.paramBufferBytesUsed);\n> + }\n> +\n> actions += [&]() { data->ipa_->stop(); };\n> data->sensor_->setControls(&res.controls);\n> data->delayedCtrls_->reset();\n> \n> - data->frame_ = 0;\n> - nextParamsSequence_ = 0;\n> - nextStatsToProcess_ = 0;\n> - paramsSyncHelper_.reset();\n> - imageSyncHelper_.reset();\n> -\n> if (!isRaw_) {\n> ret = param_->streamOn();\n> if (ret) {\n> -- \n> 2.48.1\n>","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 CD27EBDCBF\n\tfor ;\n\tThu, 22 Jan 2026 09:17:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7AB9661FF3;\n\tThu, 22 Jan 2026 10:17:41 +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 9071461FBF\n\tfor ;\n\tThu, 22 Jan 2026 10:17:39 +0100 (CET)","from neptunite.rasen.tech (unknown\n\t[IPv6:2404:7a81:160:2100:8816:a947:ebed:2ec7])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id A78FF2DD;\n\tThu, 22 Jan 2026 10:17:06 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"mnsKpZw9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769073427;\n\tbh=Vhl6QprYM65n3DU+kjzzgtFSFGS3WI3E9dWk9ILlfRw=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=mnsKpZw9DXsAwssrH2XydYvozgs06h3qiF+/7JM3tTKm1FvPy9na3946SpvRQoM0Q\n\tv3t5cbI+tDknhfgXY6pHO+FRRsVvrYA7MeFgmDqgxpFEI65TMMXqynyCYUIMH9IlVU\n\tU383Izpl5ESaXOi5cMeJfcmwSJ4tMDZJab3cN0Ik=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251024085130.995967-31-stefan.klug@ideasonboard.com>","References":"<20251024085130.995967-1-stefan.klug@ideasonboard.com>\n\t<20251024085130.995967-31-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v1 30/35] pipeline: rkisp1: Correctly handle params\n\tbuffer for frame 0","From":"Paul Elder ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 22 Jan 2026 18:17:33 +0900","Message-ID":"<176907345374.3882822.3463635321837008359@neptunite.rasen.tech>","User-Agent":"alot/0.0.0","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\" "}}]