[{"id":35697,"web_url":"https://patchwork.libcamera.org/comment/35697/","msgid":"<175699431802.27459.5283850653886488939@ping.linuxembedded.co.uk>","date":"2025-09-04T13:58:38","subject":"Re: [PATCH v3 1/2] pipelines: Use lambda functions to factor out\n\tbuffer mapping code","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2025-09-04 14:46:40)\n> Multiple pipeline handlers duplicate code related to mapping params and\n> stats buffers to IPA modules. Factor out the code to lambda functions to\n> share it between the two buffer types.\n> \n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Barnabás Pőcze \n> ---\n> Changes since v1:\n> \n> - Move for loop to pushBuffers() function\n> - Drop unneeded lambda function arguments\n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 16 ++++++------\n> src/libcamera/pipeline/mali-c55/mali-c55.cpp | 26 +++++++++++---------\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 23 +++++++++--------\n> 3 files changed, 33 insertions(+), 32 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index ad20810e6a26..bfbc80af6a3c 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -678,15 +678,15 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n> /* Map buffers to the IPA. */\n> unsigned int ipaBufferId = 1;\n> \n> - for (const std::unique_ptr &buffer : imgu->paramBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - ipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n> - }\n> + auto pushBuffers = [&](const std::vector> &buffers) {\n> + for (const std::unique_ptr &buffer : buffers) {\n> + buffer->setCookie(ipaBufferId++);\n> + ipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n> + }\n> + };\n> \n> - for (const std::unique_ptr &buffer : imgu->statBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - ipaBuffers_.emplace_back(buffer->cookie(), buffer->planes());\n> - }\n> + pushBuffers(imgu->paramBuffers_);\n> + pushBuffers(imgu->statBuffers_);\n\nSeems ok to me. I'm not sure I would have named this pushBuffers but I\nhaven't got a better name so :\n\n\nReviewed-by: Kieran Bingham \n\n> \n> data->ipa_->mapBuffers(ipaBuffers_);\n> \n> diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> index 76341ed3f363..97996399fc51 100644\n> --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n> @@ -1133,27 +1133,29 @@ int PipelineHandlerMaliC55::allocateBuffers(Camera *camera)\n> data->dsStream_.configuration().bufferCount,\n> });\n> \n> + auto pushBuffers = [&](const std::vector> &buffers,\n> + std::queue &queue,\n> + std::vector &ipaBuffers) {\n> + for (const std::unique_ptr &buffer : buffers) {\n> + buffer->setCookie(ipaBufferId++);\n> + ipaBuffers.emplace_back(buffer->cookie(), buffer->planes());\n> + queue.push(buffer.get());\n> + }\n> + };\n> +\n> ret = stats_->allocateBuffers(bufferCount, &statsBuffers_);\n> if (ret < 0)\n> return ret;\n> \n> - for (std::unique_ptr &buffer : statsBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - data->ipaStatBuffers_.emplace_back(buffer->cookie(),\n> - buffer->planes());\n> - availableStatsBuffers_.push(buffer.get());\n> - }\n> + pushBuffers(statsBuffers_, availableStatsBuffers_,\n> + data->ipaStatBuffers_);\n> \n> ret = params_->allocateBuffers(bufferCount, ¶msBuffers_);\n> if (ret < 0)\n> return ret;\n> \n> - for (std::unique_ptr &buffer : paramsBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - data->ipaParamBuffers_.emplace_back(buffer->cookie(),\n> - buffer->planes());\n> - availableParamsBuffers_.push(buffer.get());\n> - }\n> + pushBuffers(paramsBuffers_, availableParamsBuffers_,\n> + data->ipaParamBuffers_);\n> \n> if (data->ipa_) {\n> data->ipa_->mapBuffers(data->ipaStatBuffers_, true);\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 55d7d4442caf..291f96836c5e 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -1028,19 +1028,18 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n> availableMainPathBuffers_.push(buffer.get());\n> }\n> \n> - for (std::unique_ptr &buffer : paramBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - data->ipaBuffers_.emplace_back(buffer->cookie(),\n> - buffer->planes());\n> - availableParamBuffers_.push(buffer.get());\n> - }\n> + auto pushBuffers = [&](const std::vector> &buffers,\n> + std::queue &queue) {\n> + for (const std::unique_ptr &buffer : buffers) {\n> + buffer->setCookie(ipaBufferId++);\n> + data->ipaBuffers_.emplace_back(buffer->cookie(),\n> + buffer->planes());\n> + queue.push(buffer.get());\n> + }\n> + };\n> \n> - for (std::unique_ptr &buffer : statBuffers_) {\n> - buffer->setCookie(ipaBufferId++);\n> - data->ipaBuffers_.emplace_back(buffer->cookie(),\n> - buffer->planes());\n> - availableStatBuffers_.push(buffer.get());\n> - }\n> + pushBuffers(paramBuffers_, availableParamBuffers_);\n> + pushBuffers(statBuffers_, availableStatBuffers_);\n> \n> data->ipa_->mapBuffers(data->ipaBuffers_);\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart\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 88456BEFBE\n\tfor ;\n\tThu, 4 Sep 2025 13:58:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0B5D069338;\n\tThu, 4 Sep 2025 15:58:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BE7F1692EF\n\tfor ;\n\tThu, 4 Sep 2025 15:58:40 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 40254F09;\n\tThu, 4 Sep 2025 15:57:31 +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=\"sXAPOlsr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1756994251;\n\tbh=Al9cvdLLWAlPKKg0xwOusEpvkHAhha2g8MCe6y9pPw8=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=sXAPOlsrL50hW5z3hbP58hySeaBK7wqVwGoysrupRHPv3cAXUOEkG82qjjEHzVrbj\n\tkB6ImN1/zEShw5Re5wAXlLW5hFeNYRv/YXwDlEesgo7RVBOTzeDgnk0izYv/xuz+cy\n\t8nsT1vF2j3Ku9jgX89jlpqPZPp5vm4IWhRXHWKrc=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250904134641.29597-2-laurent.pinchart@ideasonboard.com>","References":"<20250904134641.29597-1-laurent.pinchart@ideasonboard.com>\n\t<20250904134641.29597-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH v3 1/2] pipelines: Use lambda functions to factor out\n\tbuffer mapping code","From":"Kieran Bingham ","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 04 Sep 2025 14:58:38 +0100","Message-ID":"<175699431802.27459.5283850653886488939@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}}]