[{"id":32080,"web_url":"https://patchwork.libcamera.org/comment/32080/","msgid":"","date":"2024-11-08T15:41:54","subject":"Re: [PATCH v2 6/6] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Dan\n\nOn Thu, Nov 07, 2024 at 10:25:08AM +0000, Daniel Scally wrote:\n> Rather than hard coding default delays for control values in the\n> pipeline handlers, pick up the ones defined in the CameraSensor\n> properties.\n>\n> Signed-off-by: Daniel Scally \n> ---\n> Changes 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(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 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\nWrong alignment\n\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_ =\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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 \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \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 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_ =\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 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 \n> #include \n> +#include \n> #include \n> #include \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 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> --\n> 2.30.2\n>","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 CBEF9BE173\n\tfor ;\n\tFri, 8 Nov 2024 15:41:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7B498657B4;\n\tFri, 8 Nov 2024 16:41:58 +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 18D5C657AB\n\tfor ;\n\tFri, 8 Nov 2024 16:41:57 +0100 (CET)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 688162E0;\n\tFri, 8 Nov 2024 16:41:47 +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=\"e0Gbvwav\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1731080507;\n\tbh=KZspi/LKLjXSEhj/vFS303kdSFxuARAMdzZ/vZAjG7w=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=e0Gbvwav3mQ6AIppj6Caniju9dHoo4Kvs9OikeRN1xZOe8vyQJKW3oPcgYdYBmfQ6\n\tgIqhsJA0Fpk8WRrE7wq/x4VX7niyMEhnO3HXCochLsbKvqmeCoLV1HhQi4T+buJg9X\n\tji1FbOAatBbeJdT1nnTypuTkCZRmVmc5qKaN8ZfM=","Date":"Fri, 8 Nov 2024 16:41:54 +0100","From":"Jacopo Mondi ","To":"Daniel Scally ","Cc":"libcamera-devel@lists.libcamera.org, mike.rudenko@gmail.com","Subject":"Re: [PATCH v2 6/6] libcamera: pipelines: Draw control delays from\n\tCameraSensor properties","Message-ID":"","References":"<20241107102508.48322-1-dan.scally@ideasonboard.com>\n\t<20241107102508.48322-7-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20241107102508.48322-7-dan.scally@ideasonboard.com>","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\" "}}]