{"id":21796,"url":"https://patchwork.libcamera.org/api/patches/21796/?format=json","web_url":"https://patchwork.libcamera.org/patch/21796/","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":"<20241031160741.253855-7-dan.scally@ideasonboard.com>","date":"2024-10-31T16:07:41","name":"[6/6] libcamera: pipelines: Draw control delays from CameraSensor properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"37512854294fb766535067978b8477092478135a","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21796/mbox/","series":[{"id":4762,"url":"https://patchwork.libcamera.org/api/series/4762/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4762","date":"2024-10-31T16:07:35","name":"Centralise common functions in IPA modules","version":1,"mbox":"https://patchwork.libcamera.org/series/4762/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21796/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21796/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 2B622C330D\n\tfor ;\n\tThu, 31 Oct 2024 16:08:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C4E65653BB;\n\tThu, 31 Oct 2024 17:08:26 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 26E626039B\n\tfor ;\n\tThu, 31 Oct 2024 17:08:14 +0100 (CET)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0F84AF50;\n\tThu, 31 Oct 2024 17:08:10 +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=\"PGIxKy40\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730390890;\n\tbh=LXXSy6kSZfGLfSaMmhAWEFpY8azs3ZYlwWXWhT2/uzY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PGIxKy40ailYddioYjYd+nCKLuIYYQJw4DKXJwp08N6HNhBvp/USDJt8dzqW9YpsI\n\tjPfIEBHaCN6uhNBuurrBnLJER8ZY4ZSb8aitnxPcjcPCPzWi2adVmm9C0KR2YglID9\n\tIAZTcqwIs1H/4xJSA4hOd2NBvf2u96ucAyuD+l4o=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"mike.rudenko@gmail.com,\n\tDaniel Scally ","Subject":"[PATCH 6/6] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties","Date":"Thu, 31 Oct 2024 16:07:41 +0000","Message-Id":"<20241031160741.253855-7-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20241031160741.253855-1-dan.scally@ideasonboard.com>","References":"<20241031160741.253855-1-dan.scally@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":"Rather than hard coding default delays for control values in the\npipeline handlers, pick up the ones defined in the CameraSensor\nproperties.\n\nSigned-off-by: Daniel Scally \n---\n\nI note that the simple pipeline handler had a Gain delay of 2 rather than the\nstandard 1...I don't think the difference from the norm is correct but thought\nI would highlight it in case I'm mistaken.\n\n src/libcamera/pipeline/ipu3/ipu3.cpp | 11 ++++-------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 +++++-------\n src/libcamera/pipeline/simple/simple.cpp | 7 +++++--\n 3 files changed, 14 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 29d3c6c1..ff58ba28 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1077,14 +1077,11 @@ int PipelineHandlerIPU3::registerCameras()\n \t\tif (ret)\n \t\t\tcontinue;\n \n-\t\t/*\n-\t\t * \\todo Read delay values from the sensor itself or from a\n-\t\t * a sensor database. For now use generic values taken from\n-\t\t * the Raspberry Pi and listed as 'generic values'.\n-\t\t */\n+\t\tunsigned int gainDelay = data->properties_.get(properties::GainDelay).value();\n+\t\tunsigned int exposureDelay = data->properties_.get(properties::ExposureDelay).value();\n \t\tstd::unordered_map params = {\n-\t\t\t{ V4L2_CID_ANALOGUE_GAIN, { 1, false } },\n-\t\t\t{ V4L2_CID_EXPOSURE, { 2, false } },\n+\t\t\t{ V4L2_CID_ANALOGUE_GAIN, { gainDelay, false } },\n+\t\t\t{ V4L2_CID_EXPOSURE, { exposureDelay, false } },\n \t\t};\n \n \t\tdata->delayedCtrls_ =\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex c7b0b392..43e1315f 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -24,6 +24,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -1240,14 +1241,11 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \t/* Initialize the camera properties. */\n \tdata->properties_ = data->sensor_->properties();\n \n-\t/*\n-\t * \\todo Read delay values from the sensor itself or from a\n-\t * a sensor database. For now use generic values taken from\n-\t * the Raspberry Pi and listed as generic values.\n-\t */\n+\tunsigned int gainDelay = data->properties_.get(properties::GainDelay).value();\n+\tunsigned int exposureDelay = data->properties_.get(properties::ExposureDelay).value();\n \tstd::unordered_map params = {\n-\t\t{ V4L2_CID_ANALOGUE_GAIN, { 1, false } },\n-\t\t{ V4L2_CID_EXPOSURE, { 2, false } },\n+\t\t{ V4L2_CID_ANALOGUE_GAIN, { gainDelay, false } },\n+\t\t{ V4L2_CID_EXPOSURE, { exposureDelay, false } },\n \t};\n \n \tdata->delayedCtrls_ =\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 3ddce71d..20c97c37 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -26,6 +26,7 @@\n \n #include \n #include \n+#include \n #include \n #include \n \n@@ -1286,9 +1287,11 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tif (outputCfgs.empty())\n \t\treturn 0;\n \n+\tunsigned int gainDelay = data->properties_.get(properties::GainDelay).value();\n+\tunsigned int exposureDelay = data->properties_.get(properties::ExposureDelay).value();\n \tstd::unordered_map params = {\n-\t\t{ V4L2_CID_ANALOGUE_GAIN, { 2, false } },\n-\t\t{ V4L2_CID_EXPOSURE, { 2, false } },\n+\t\t{ V4L2_CID_ANALOGUE_GAIN, { gainDelay, false } },\n+\t\t{ V4L2_CID_EXPOSURE, { exposureDelay, false } },\n \t};\n \tdata->delayedCtrls_ =\n \t\tstd::make_unique(data->sensor_->device(),\n","prefixes":["6/6"]}