Patch Detail
Show a patch.
GET /api/1.1/patches/21832/?format=api
{ "id": 21832, "url": "https://patchwork.libcamera.org/api/1.1/patches/21832/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21832/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20241107102508.48322-7-dan.scally@ideasonboard.com>", "date": "2024-11-07T10:25:08", "name": "[v2,6/6] libcamera: pipelines: Draw control delays from CameraSensor properties", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "81baf784b5ed03eaffa16b00fb31790dd5523f61", "submitter": { "id": 156, "url": "https://patchwork.libcamera.org/api/1.1/people/156/?format=api", "name": "Dan Scally", "email": "dan.scally@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21832/mbox/", "series": [ { "id": 4775, "url": "https://patchwork.libcamera.org/api/1.1/series/4775/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4775", "date": "2024-11-07T10:25:03", "name": "Centralise common functions in IPA modules", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4775/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21832/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21832/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 590CDC32CE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 7 Nov 2024 10:25:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E03436546F;\n\tThu, 7 Nov 2024 11:25:32 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F298360363\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 7 Nov 2024 11:25:25 +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 22C1A9FF;\n\tThu, 7 Nov 2024 11:25:17 +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=\"W550fsYs\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1730975117;\n\tbh=oIO8NS20PsRhy5yCC95Lbt4CQ1IGfsZ2f3/md1179YM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=W550fsYsApKM1rGib5mub+s6Dt35BLoDrdJXSrcugDtoAPWwCEx2oHV+f/PKXc82U\n\tIe2oDcTs6k28S0YXDlPG/Ontvk6yx2U/w94LPISsWczKbSZ9K/PtsVLrCAYWzrl2mG\n\tRw4ffKvExGvcBH1NmekqLEcBYy6yDmVsfYM1uyNI=", "From": "Daniel Scally <dan.scally@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "mike.rudenko@gmail.com,\n\tDaniel Scally <dan.scally@ideasonboard.com>", "Subject": "[PATCH v2 6/6] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties", "Date": "Thu, 7 Nov 2024 10:25:08 +0000", "Message-Id": "<20241107102508.48322-7-dan.scally@ideasonboard.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20241107102508.48322-1-dan.scally@ideasonboard.com>", "References": "<20241107102508.48322-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <dan.scally@ideasonboard.com>\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 29d3c6c1..50f887c6 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\t vblankDelay, hblankDelay);\n \t\tstd::unordered_map<uint32_t, DelayedControls::ControlParams> 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..a73cb6f2 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -24,6 +24,7 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/formats.h>\n #include <libcamera/framebuffer.h>\n+#include <libcamera/property_ids.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n #include <libcamera/transform.h>\n@@ -1240,14 +1241,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<uint32_t, DelayedControls::ControlParams> 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..81dd9379 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 <libcamera/camera.h>\n #include <libcamera/control_ids.h>\n+#include <libcamera/property_ids.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n@@ -1286,9 +1287,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<uint32_t, DelayedControls::ControlParams> 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<DelayedControls>(data->sensor_->device(),\n", "prefixes": [ "v2", "6/6" ] }