[{"id":21119,"web_url":"https://patchwork.libcamera.org/comment/21119/","msgid":"","date":"2021-11-23T11:01:38","subject":"Re: [libcamera-devel] [PATCH v2 08/11] ipa: rkisp1: Report and use\n\tsensor controls","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Tue, Nov 23, 2021 at 10:14:48AM +0100, Jean-Michel Hautbois wrote:\n> The pipeline handler populates a new sensorControls ControlList, to\n> have the effective exposure and gain values for the current frame. This\n> is done when a statistics buffer is received.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\nAs Kieran mentioned on v1, it would be good to refactor both IPU3 and\nRkISP1 to drop actions/events in favour of ad-hoc methods.\n\n> ---\n> include/libcamera/ipa/rkisp1.mojom | 2 ++\n> src/ipa/rkisp1/rkisp1.cpp | 2 +-\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 3 ++-\n> 3 files changed, 5 insertions(+), 2 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index a6991d4f..c3a6d8e1 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -21,11 +21,13 @@ struct RkISP1Event {\n> \tuint32 frame;\n> \tuint32 bufferId;\n> \tlibcamera.ControlList controls;\n> +\tlibcamera.ControlList sensorControls;\n> };\n> \n> struct RkISP1Action {\n> \tRkISP1Operations op;\n> \tlibcamera.ControlList controls;\n> +\tlibcamera.ControlList sensorControls;\n> };\n> \n> interface IPARkISP1Interface {\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 0c54d8ec..b5aa93f8 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -312,7 +312,7 @@ void IPARkISP1::setControls(unsigned int frame)\n> \tControlList ctrls(ctrls_);\n> \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_));\n> \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain_));\n> -\top.controls = ctrls;\n> +\top.sensorControls = ctrls;\n> \n> \tqueueFrameAction.emit(frame, op);\n> }\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 6cdc4c03..36ef6a02 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -333,7 +333,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n> {\n> \tswitch (action.op) {\n> \tcase ipa::rkisp1::ActionV4L2Set: {\n> -\t\tconst ControlList &controls = action.controls;\n> +\t\tconst ControlList &controls = action.sensorControls;\n> \t\tdelayedCtrls_->push(controls);\n> \t\tbreak;\n> \t}\n> @@ -1124,6 +1124,7 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer)\n> \tev.op = ipa::rkisp1::EventSignalStatBuffer;\n> \tev.frame = info->frame;\n> \tev.bufferId = info->statBuffer->cookie();\n> +\tev.sensorControls = data->delayedCtrls_->get(buffer->metadata().sequence);\n> \tdata->ipa_->processEvent(ev);\n> }\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 36CE9BF415\n\tfor ;\n\tTue, 23 Nov 2021 11:02:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7AEBD6038A;\n\tTue, 23 Nov 2021 12:02:05 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB2FD60228\n\tfor ;\n\tTue, 23 Nov 2021 12:02:00 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 28C31A1B;\n\tTue, 23 Nov 2021 12:02:00 +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=\"mgQlSj2e\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637665320;\n\tbh=2KcRblAodSFMNbcIghax3TvDItxmMafTUqBRX2riJw0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=mgQlSj2enLkGXsd0cIb4YSNxf9oBVgEUes1433TAdNu7LSndUnHnrr3Kqn1VAbNxZ\n\tDjktG2nWVEO/0c0PD9oSsabAhhWP2jVrZVFqYSJ3NYRHcGOMYQntwDUf8UG7D6hl/P\n\toN5fIu0IHsC/OTQg42IixSa1A+yDg/+Zo8h+jlc4=","Date":"Tue, 23 Nov 2021 13:01:38 +0200","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20211123091451.67404-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211123091451.67404-9-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211123091451.67404-9-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 08/11] ipa: rkisp1: Report and use\n\tsensor controls","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]