{"id":22017,"url":"https://patchwork.libcamera.org/api/1.1/patches/22017/?format=json","web_url":"https://patchwork.libcamera.org/patch/22017/","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":"<20241119130301.264972-3-dan.scally@ideasonboard.com>","date":"2024-11-19T13:03:01","name":"[v4,2/2] libcamera: pipelines: Draw control delays from CameraSensor properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c5a2c0fc2b183a04e926cb2087c4ffeb71c4bca9","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/1.1/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22017/mbox/","series":[{"id":4805,"url":"https://patchwork.libcamera.org/api/1.1/series/4805/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4805","date":"2024-11-19T13:02:59","name":"Add sensor control delays to CameraSensorProperties","version":4,"mbox":"https://patchwork.libcamera.org/series/4805/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22017/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22017/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 9C796C32F1\n\tfor ;\n\tTue, 19 Nov 2024 13:03:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 527F165F22;\n\tTue, 19 Nov 2024 14:03:17 +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 A120165F0F\n\tfor ;\n\tTue, 19 Nov 2024 14:03:13 +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 1905F1230;\n\tTue, 19 Nov 2024 14:02:52 +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=\"J0CYip8K\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732021372;\n\tbh=+4j952447lT+/7q3/2E93uYtTQvpr0PaVGMZve6FAck=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=J0CYip8KwU/dbYep3bmD+qK30gY/l5/5Homz4CGKVgPIK136B381mDS8ZxPrl+oXH\n\teJ3VhZdCVErAbYuJzoH0d1L/H67zN8JRh3fF8y0eJnwS528BxIjZ9FxSNgt6N5PAFe\n\t9fgh2G9UXfrGzkrizrneKH7+2i9TRbZd8vPx+PPI=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"mike.rudenko@gmail.com,\n\tDaniel Scally ","Subject":"[PATCH v4 2/2] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties","Date":"Tue, 19 Nov 2024 13:03:01 +0000","Message-Id":"<20241119130301.264972-3-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20241119130301.264972-1-dan.scally@ideasonboard.com>","References":"<20241119130301.264972-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 v4:\n\n\t- Used the struct reference rather than values directly\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 | 10 +++-------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 11 ++++-------\n src/libcamera/pipeline/simple/simple.cpp | 6 ++++--\n 3 files changed, 11 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 0069d5e2..f4e33830 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1077,14 +1077,10 @@ 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\tconst CameraSensorProperties::SensorDelays &delays = cio2->sensor()->sensorDelays();\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, { delays.gainDelay, false } },\n+\t\t\t{ V4L2_CID_EXPOSURE, { delays.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..9118d893 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,10 @@ 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+\tconst CameraSensorProperties::SensorDelays &delays = data->sensor_->sensorDelays();\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, { delays.gainDelay, false } },\n+\t\t{ V4L2_CID_EXPOSURE, { delays.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..9e759bf8 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,10 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tif (outputCfgs.empty())\n \t\treturn 0;\n \n+\tconst CameraSensorProperties::SensorDelays &delays = data->sensor_->sensorDelays();\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, { delays.gainDelay, false } },\n+\t\t{ V4L2_CID_EXPOSURE, { delays.exposureDelay, false } },\n \t};\n \tdata->delayedCtrls_ =\n \t\tstd::make_unique(data->sensor_->device(),\n","prefixes":["v4","2/2"]}