[{"id":30324,"web_url":"https://patchwork.libcamera.org/comment/30324/","msgid":"<kntpw5cjvx7evzls3zfcaiwrlhytbqvskurzezfwhoyxgoz2fa@kxpzqykvhciq>","date":"2024-07-04T10:59:18","subject":"Re: [PATCH v1 04/11] ipa: rkisp1: Pass parameters buffer size to\n\tpipeline handler","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"On Thu, Jul 04, 2024 at 01:52:23AM GMT, Laurent Pinchart wrote:\n> From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nWell, this was not a standalone patch in my tree, so if you want to\nretain authorship feel free to do so\n\n>\n> The ISP parameters buffer currently has a fixed payload size, which is\n> hardcoded in the pipeline handler. To prepare for support of the\n> extensible parameters format that has a variable payload size, pass the\n> size from the IPA module to the pipeline handler explicitly. Keep the\n> size hardcoded to sizeof(struct rkisp1_params_cfg) for now, this will be\n> udpated later.\n>\n> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nThanks\n  j\n\n> ---\n>  include/libcamera/ipa/rkisp1.mojom       | 2 +-\n>  src/ipa/rkisp1/rkisp1.cpp                | 2 +-\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 7 +++----\n>  3 files changed, 5 insertions(+), 6 deletions(-)\n>\n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index 585d38572aa2..80d54a03aa90 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -37,7 +37,7 @@ interface IPARkISP1Interface {\n>  };\n>\n>  interface IPARkISP1EventInterface {\n> -\tparamsBufferReady(uint32 frame);\n> +\tparamsBufferReady(uint32 frame, uint32 bytesused);\n>  \tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\n>  \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n>  };\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 71698bc47391..84ffe6cf2777 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -332,7 +332,7 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n>  \tfor (auto const &algo : algorithms())\n>  \t\talgo->prepare(context_, frame, frameContext, params);\n>\n> -\tparamsBufferReady.emit(frame);\n> +\tparamsBufferReady.emit(frame, sizeof(*params));\n>  }\n>\n>  void IPARkISP1::processStatsBuffer(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 73e56b8fbf13..f5c01a2566d2 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -110,7 +110,7 @@ public:\n>  \tstd::unique_ptr<ipa::rkisp1::IPAProxyRkISP1> ipa_;\n>\n>  private:\n> -\tvoid paramFilled(unsigned int frame);\n> +\tvoid paramFilled(unsigned int frame, unsigned int bytesused);\n>  \tvoid setSensorControls(unsigned int frame,\n>  \t\t\t       const ControlList &sensorControls);\n>\n> @@ -379,15 +379,14 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n>  \treturn 0;\n>  }\n>\n> -void RkISP1CameraData::paramFilled(unsigned int frame)\n> +void RkISP1CameraData::paramFilled(unsigned int frame, unsigned int bytesused)\n>  {\n>  \tPipelineHandlerRkISP1 *pipe = RkISP1CameraData::pipe();\n>  \tRkISP1FrameInfo *info = frameInfo_.find(frame);\n>  \tif (!info)\n>  \t\treturn;\n>\n> -\tinfo->paramBuffer->_d()->metadata().planes()[0].bytesused =\n> -\t\tsizeof(struct rkisp1_params_cfg);\n> +\tinfo->paramBuffer->_d()->metadata().planes()[0].bytesused = bytesused;\n>  \tpipe->param_->queueBuffer(info->paramBuffer);\n>  \tpipe->stat_->queueBuffer(info->statBuffer);\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 936A6BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  4 Jul 2024 10:59:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2D9C162E24;\n\tThu,  4 Jul 2024 12:59:23 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 86953619C8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  4 Jul 2024 12:59:21 +0200 (CEST)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AE4AD502;\n\tThu,  4 Jul 2024 12:58:52 +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=\"GnEuyUrO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720090732;\n\tbh=ma1Ci5e7MR7xD5WXzcEKOmuFMyCO75JeZYG/YN6YRyA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=GnEuyUrOUmbx4SPfQzy7blHbnrnDw0lXB2kubxvgp7YmonjcFcLGMyJcdHL+goVm0\n\tuohxN8RE20Kg8OUlx6UB6mtkyy/U/X38zFxRy7eS7oq2RMpZH6yEWSbGx+JtvhF/re\n\ti1CMdQFQmqqtJ5k9eESYtwOAu41IkGkn1dqOd0QQ=","Date":"Thu, 4 Jul 2024 12:59:18 +0200","From":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org, \n\tJacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>","Subject":"Re: [PATCH v1 04/11] ipa: rkisp1: Pass parameters buffer size to\n\tpipeline handler","Message-ID":"<kntpw5cjvx7evzls3zfcaiwrlhytbqvskurzezfwhoyxgoz2fa@kxpzqykvhciq>","References":"<20240703225230.3530-1-laurent.pinchart@ideasonboard.com>\n\t<20240703225230.3530-5-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240703225230.3530-5-laurent.pinchart@ideasonboard.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]