{"id":14692,"url":"https://patchwork.libcamera.org/api/patches/14692/?format=json","web_url":"https://patchwork.libcamera.org/patch/14692/","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":"<20211123091451.67404-9-jeanmichel.hautbois@ideasonboard.com>","date":"2021-11-23T09:14:48","name":"[libcamera-devel,v2,08/11] ipa: rkisp1: Report and use sensor controls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"69b57ea59fdd565af65e04657aa132fa0172886e","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14692/mbox/","series":[{"id":2741,"url":"https://patchwork.libcamera.org/api/series/2741/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2741","date":"2021-11-23T09:14:40","name":"Introduce AGC for RkISP1","version":2,"mbox":"https://patchwork.libcamera.org/series/2741/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14692/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14692/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 8B985C3250\n\tfor ;\n\tTue, 23 Nov 2021 09:15:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2494A6043C;\n\tTue, 23 Nov 2021 10:15:10 +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 5CDF460398\n\tfor ;\n\tTue, 23 Nov 2021 10:14:58 +0100 (CET)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:3c3b:9149:b:8aa9])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1A37511BB;\n\tTue, 23 Nov 2021 10:14:58 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"fMVNELaw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637658898;\n\tbh=Esr2kiZNj6jLvz3SXVFZnyjOJAGouO/3oyLS6zLdVDE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fMVNELawZfxBJqS/PFogiJq8Ty/P8Yn6E/ICy35gn2uX7l2bWXwmOO6QOoFjBA4WC\n\toFHnbEDrSNDgRpF4CxBb/QSuUskUMgvMhnsmnkB/NtbCChRRHIjlDCe9WB1VMmuGdm\n\tdZB6tG5oxqH4XStWl8thPa2fLjDZKuamSZRHp2M8=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Nov 2021 10:14:48 +0100","Message-Id":"<20211123091451.67404-9-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211123091451.67404-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20211123091451.67404-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The pipeline handler populates a new sensorControls ControlList, to\nhave the effective exposure and gain values for the current frame. This\nis done when a statistics buffer is received.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham \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(-)","diff":"diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\nindex 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 {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 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 }\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 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 \n","prefixes":["libcamera-devel","v2","08/11"]}