{"id":19712,"url":"https://patchwork.libcamera.org/api/1.1/patches/19712/?format=json","web_url":"https://patchwork.libcamera.org/patch/19712/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240313121223.138150-12-stefan.klug@ideasonboard.com>","date":"2024-03-13T12:12:22","name":"[v2,11/12] pipeline: rkisp1: Fix per-frame-controls in manual mode","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"206b9d2e4adc51b6b4a5139bd38db574d355bc0e","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19712/mbox/","series":[{"id":4221,"url":"https://patchwork.libcamera.org/api/1.1/series/4221/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4221","date":"2024-03-13T12:12:11","name":"Preparation for per-frame-controls and initial tests","version":2,"mbox":"https://patchwork.libcamera.org/series/4221/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19712/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19712/checks/","tags":{},"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 1B013C32C4\n\tfor ;\n\tWed, 13 Mar 2024 12:13:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8B83F62CAF;\n\tWed, 13 Mar 2024 13:13:04 +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 9ED9962C96\n\tfor ;\n\tWed, 13 Mar 2024 13:12:46 +0100 (CET)","from jasper.fritz.box (unknown\n\t[IPv6:2a00:6020:448c:6c00:9b07:31b5:38e1:e957])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1D161899;\n\tWed, 13 Mar 2024 13:12:24 +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=\"jwfsVsQ5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710331944;\n\tbh=7OIkJ8llq2WQ664El73vGRKGKvUxgjQIquAjBIulhF4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=jwfsVsQ5Y0rRyKAD3SO31uj3GfEFh9TqzmQEiPIfWpqwdS7J500AYtfzdjmtoUGOE\n\tGivsZxHqbb/Ff6Ey7Pb7lMIdlE98yyYWO4MeraG2Lqwx/vo9OiN2hxmznaDGeCHe5n\n\tyUqdSOoXTZ+/ixtIsb5DaNKal1TRHgi9/QwvdBb0=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 11/12] pipeline: rkisp1: Fix per-frame-controls in manual\n\tmode","Date":"Wed, 13 Mar 2024 13:12:22 +0100","Message-Id":"<20240313121223.138150-12-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.40.1","In-Reply-To":"<20240313121223.138150-1-stefan.klug@ideasonboard.com>","References":"<20240313121223.138150-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Stefan Klug ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"If the isp is not regulating, it can forward the request directly to\nthe pipeline handler which will then be able to feed the delayed controls\nearly enough.\n\nThis solutions is quite simplistic and will need more thoughts as soon\nas other algorithms get implemented.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/rkisp1/rkisp1.cpp | 16 ++++++++++++++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n 2 files changed, 15 insertions(+), 3 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 71db2ae7..8780abc9 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -321,6 +321,12 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)\n \t\t\tcontinue;\n \t\talgo->queueRequest(context_, frame, frameContext, controls);\n \t}\n+\n+\t/* Fast path, if we are not regulating */\n+\tif (!frameContext.agc.autoEnabled) {\n+\t\tControlList ctrls = getControls(frame);\n+\t\tsetSensorControls.emit(frame, ctrls);\n+\t}\n }\n \n void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)\n@@ -369,8 +375,14 @@ void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId\n \t\talgo->process(context_, frame, frameContext, stats, metadata);\n \t}\n \n-\tControlList ctrls = getControls(frame);\n-\tsetSensorControls.emit(frame, ctrls);\n+\t/*\n+\t * Set controls only when we are actually regulation. Otherwise, the controls\n+\t * where already set in queueRequest\n+\t */\n+\tif (frameContext.agc.autoEnabled) {\n+\t\tControlList ctrls = getControls(frame);\n+\t\tsetSensorControls.emit(frame, ctrls);\n+\t}\n \n \tmetadataReady.emit(frame, metadata);\n }\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 586b46d6..3e061b52 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -401,7 +401,7 @@ void RkISP1CameraData::paramFilled(unsigned int frame)\n void RkISP1CameraData::setSensorControls([[maybe_unused]] unsigned int frame,\n \t\t\t\t\t const ControlList &sensorControls)\n {\n-\tdelayedCtrls_->push(sensorControls);\n+\tdelayedCtrls_->pushForFrame(frame, sensorControls);\n }\n \n void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata)\n","prefixes":["v2","11/12"]}