{"id":19753,"url":"https://patchwork.libcamera.org/api/patches/19753/?format=json","web_url":"https://patchwork.libcamera.org/patch/19753/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240319120517.362082-14-stefan.klug@ideasonboard.com>","date":"2024-03-19T12:05:14","name":"[v3,13/16] pipeline: rkisp1: Move call to setSensorControls.emit()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4acd26e07166d4785afe181067532e53fc1e4bbb","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19753/mbox/","series":[{"id":4230,"url":"https://patchwork.libcamera.org/api/series/4230/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4230","date":"2024-03-19T12:05:01","name":"Preparation for per-frame-controls and initial tests","version":3,"mbox":"https://patchwork.libcamera.org/series/4230/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19753/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19753/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 57B21C32C9\n\tfor ;\n\tTue, 19 Mar 2024 12:05:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EE3E762E75;\n\tTue, 19 Mar 2024 13:05:45 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAE7D62D31\n\tfor ;\n\tTue, 19 Mar 2024 13:05:30 +0100 (CET)","from jasper.fritz.box (unknown\n\t[IPv6:2a00:6020:448c:6c00:1478:344b:8fcb:baf5])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 13EBC480;\n\tTue, 19 Mar 2024 13:05:04 +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=\"Dq4+NEh8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710849904;\n\tbh=FTsVWm29oC2K18aJ3DAR3rYpJmCwuCj03DIg7SYbji0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Dq4+NEh88bPnTntWURYDSbKC+knGijwu1ttyQ2ZtLtYjKRufHHKz7QsWNBPyNTGL6\n\tuC+umDPdMHmxGDQ3FTfZl/JmewmhAODTNHt/5edIOf1trv/B1FU5MzabQTgCLB+N+g\n\tjxUiq43YGGbx9SaeuiCpZFHog5SODkoZbRg9zhtQ=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v3 13/16] pipeline: rkisp1: Move call to\n\tsetSensorControls.emit()","Date":"Tue, 19 Mar 2024 13:05:14 +0100","Message-Id":"<20240319120517.362082-14-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.40.1","In-Reply-To":"<20240319120517.362082-1-stefan.klug@ideasonboard.com>","References":"<20240319120517.362082-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":"into processStateBuffer(). This is a non-functional change and in\npreparation for the next commit.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/rkisp1/rkisp1.cpp | 18 +++++++-----------\n 1 file changed, 7 insertions(+), 11 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 9dc5f53c..44d03eb8 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -74,7 +74,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 getControls(unsigned int frame);\n \n \tstd::map buffers_;\n \tstd::map mappedBuffers_;\n@@ -201,7 +201,8 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \n int IPARkISP1::start()\n {\n-\tsetControls(0);\n+\tControlList ctrls = getControls(0);\n+\tsetSensorControls.emit(0, ctrls);\n \n \treturn 0;\n }\n@@ -367,7 +368,8 @@ void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId\n \t\talgo->process(context_, frame, frameContext, stats, metadata);\n \t}\n \n-\tsetControls(frame);\n+\tControlList ctrls = getControls(frame);\n+\tsetSensorControls.emit(frame, ctrls);\n \n \tmetadataReady.emit(frame, metadata);\n }\n@@ -430,13 +432,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::getControls(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 = camHelper_->gainCode(frameContext.agc.gain);\n@@ -444,8 +441,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":["v3","13/16"]}