{"id":21902,"url":"https://patchwork.libcamera.org/api/patches/21902/?format=json","web_url":"https://patchwork.libcamera.org/patch/21902/","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":"<20241115074628.417215-7-dan.scally@ideasonboard.com>","date":"2024-11-15T07:46:28","name":"[v3,6/6] libcamera: pipelines: Draw control delays from CameraSensor properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c07dca278fd1642bf19af03ac841c3f087af1e11","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/21902/mbox/","series":[{"id":4792,"url":"https://patchwork.libcamera.org/api/series/4792/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4792","date":"2024-11-15T07:46:22","name":"Centralise common functions in IPA modules","version":3,"mbox":"https://patchwork.libcamera.org/series/4792/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21902/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21902/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 59678C3261\n\tfor ;\n\tFri, 15 Nov 2024 07:47:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EDB6A65876;\n\tFri, 15 Nov 2024 08:46:59 +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 4F37065862\n\tfor ;\n\tFri, 15 Nov 2024 08:46:49 +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 D4DC71340;\n\tFri, 15 Nov 2024 08:46:34 +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=\"uT746oyy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1731656795;\n\tbh=6O0EmF3i/JczmfONoZ/puoVeIT0pZRhZUH7TZthvM28=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=uT746oyyG3Sv6pxyOxK+mJKQpHOrL0YaklEW9ymi8Lclzo3bXjvtTHU4m+RNpBblm\n\tQUOmBG6qFNJBXwNbKzfk8Z0I4wX/Ir9QZobb1KfuHyVmZUJAr5y3iEsz1/kPVRm+aE\n\te4/ExMnAleBfIOkAcJDbDD+upDIv5qnUZ15YJHnI=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"mike.rudenko@gmail.com,\n\tDaniel Scally ","Subject":"[PATCH v3 6/6] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties","Date":"Fri, 15 Nov 2024 07:46:28 +0000","Message-Id":"<20241115074628.417215-7-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20241115074628.417215-1-dan.scally@ideasonboard.com>","References":"<20241115074628.417215-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---\nChanges in v3:\n\n\t- Fixed some broken alignment \n\nChanges in v2:\n\n\t- Switched to use the new getSensorDelays() function\n\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 +++++-------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 13 ++++++-------\n src/libcamera/pipeline/simple/simple.cpp | 8 ++++++--\n 3 files changed, 17 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 0069d5e2..4d6b86b5 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1077,14 +1077,12 @@ 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\tuint8_t exposureDelay, gainDelay, vblankDelay, hblankDelay;\n+\t\tcio2->sensor()->getSensorDelays(exposureDelay, gainDelay,\n+\t\t\t\t\t\tvblankDelay, hblankDelay);\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 6c6d711f..42600908 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@@ -1239,14 +1240,12 @@ 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+\tuint8_t exposureDelay, gainDelay, vblankDelay, hblankDelay;\n+\tdata->sensor_->getSensorDelays(exposureDelay, gainDelay, vblankDelay,\n+\t\t\t\t hblankDelay);\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 41fdf84c..20f395fb 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@@ -1290,9 +1291,12 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tif (outputCfgs.empty())\n \t\treturn 0;\n \n+\tuint8_t exposureDelay, gainDelay, vblankDelay, hblankDelay;\n+\tdata->sensor_->getSensorDelays(exposureDelay, gainDelay, vblankDelay,\n+\t\t\t\t hblankDelay);\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":["v3","6/6"]}