{"id":22444,"url":"https://patchwork.libcamera.org/api/1.1/patches/22444/?format=json","web_url":"https://patchwork.libcamera.org/patch/22444/","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":"<20241220162724.756494-5-stefan.klug@ideasonboard.com>","date":"2024-12-20T16:26:50","name":"[RFC,4/7] pipeline: rkisp1: Refactor setControls()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b719bcc7ff493db6ab0b2a2969bd395c57a5463e","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/22444/mbox/","series":[{"id":4925,"url":"https://patchwork.libcamera.org/api/1.1/series/4925/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4925","date":"2024-12-20T16:26:46","name":"Improve regulation on rkisp1","version":1,"mbox":"https://patchwork.libcamera.org/series/4925/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22444/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22444/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 4825CC327D\n\tfor ;\n\tFri, 20 Dec 2024 16:27:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F0A47684BD;\n\tFri, 20 Dec 2024 17:27: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 6AC2B684B9\n\tfor ;\n\tFri, 20 Dec 2024 17:27:38 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:4eeb:7fa7:1fd0:c13d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F38E6C67;\n\tFri, 20 Dec 2024 17:26:58 +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=\"U+xsTqY2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1734712019;\n\tbh=e3ZBBzNVHwcO14bqaUorHWfBxCEyScvaJ1hk6becrN0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=U+xsTqY2B6oNsBsK5StNet3GfdbeDj8jw1feH/9QgzoRYbQvQMs3EP5JIh9I7pgzA\n\toNwqAuc341DL7R1hulkLZM+5rT3m65MrblOEqW5fTQ35qqLp5m+E2/o8VL7llXiJfZ\n\tiXAk08ojQr8Vp22VySR5ijLVpTyUVrc7W5xcdv54=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[RFC PATCH 4/7] pipeline: rkisp1: Refactor setControls()","Date":"Fri, 20 Dec 2024 17:26:50 +0100","Message-ID":"<20241220162724.756494-5-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241220162724.756494-1-stefan.klug@ideasonboard.com>","References":"<20241220162724.756494-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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"IPARkISP1::setControls() is called when new sensor controls shall be\nqueued in the pipeline handler. It constructs a list of sensor controls\nand then emits the setSensorControls signal.\n\nTo be able to return initial sensor controls from the IPARkISP1::start()\nfunction, similar functionality will be needed. Prepare for that by\nchanging the setControls() function to a getSensorControls() and by moving\nthe setSensorControls.emit() out of the function.\n\nThis patch contains no functional changes.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/rkisp1/rkisp1.cpp | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 2ffdd99b158a..45a539a61fb1 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -76,7 +76,7 @@ private:\n \tvoid updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\t\t const ControlInfoMap &sensorControls,\n \t\t\t ControlInfoMap *ipaControls);\n-\tvoid setControls(unsigned int frame);\n+\tControlList getSensorControls(unsigned int frame);\n \n \tstd::map buffers_;\n \tstd::map mappedBuffers_;\n@@ -211,7 +211,8 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \n int IPARkISP1::start()\n {\n-\tsetControls(0);\n+\tControlList ctrls = getSensorControls(0);\n+\tsetSensorControls.emit(0, ctrls);\n \n \treturn 0;\n }\n@@ -378,7 +379,12 @@ void IPARkISP1::processStats(const uint32_t frame, const uint32_t bufferId,\n \t\talgo->process(context_, frame, frameContext, stats, metadata);\n \t}\n \n-\tsetControls(frame);\n+\t/*\n+\t * \\todo: Here we should do a lookahead that takes the sensor delays\n+\t * into account.\n+\t */\n+\tControlList ctrls = getSensorControls(frame);\n+\tsetSensorControls.emit(frame, ctrls);\n \n \tcontext_.debugMetadata.moveEntries(metadata);\n \tmetadataReady.emit(frame, metadata);\n@@ -443,13 +449,8 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n }\n \n-void IPARkISP1::setControls(unsigned int frame)\n+ControlList IPARkISP1::getSensorControls(unsigned int frame)\n {\n-\t/*\n-\t * \\todo The frame number is most likely wrong here, we need to take\n-\t * internal sensor delays and other timing parameters into account.\n-\t */\n-\n \tIPAFrameContext &frameContext = context_.frameContexts.get(frame);\n \tuint32_t exposure = frameContext.agc.exposure;\n \tuint32_t gain = context_.camHelper->gainCode(frameContext.agc.gain);\n@@ -457,8 +458,7 @@ void IPARkISP1::setControls(unsigned int frame)\n \tControlList ctrls(sensorControls_);\n \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure));\n \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain));\n-\n-\tsetSensorControls.emit(frame, ctrls);\n+\treturn ctrls;\n }\n \n } /* namespace ipa::rkisp1 */\n","prefixes":["RFC","4/7"]}