Patch Detail
Show a patch.
GET /api/1.1/patches/17491/?format=api
{ "id": 17491, "url": "https://patchwork.libcamera.org/api/1.1/patches/17491/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17491/", "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": "<20221003083934.31629-5-naush@raspberrypi.com>", "date": "2022-10-03T08:39:30", "name": "[libcamera-devel,v1,4/9] pipeline: ipa: raspberrypi: Add HBLANK control to DelayedControls", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "980bb1ccb4dfcee49546a1ff9f20512a604589f6", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/1.1/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17491/mbox/", "series": [ { "id": 3523, "url": "https://patchwork.libcamera.org/api/1.1/series/3523/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3523", "date": "2022-10-03T08:39:26", "name": "Raspberry Pi: Horizontal blanking control", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3523/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17491/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17491/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 35D1BC0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 3 Oct 2022 08:40:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C48E862CEE;\n\tMon, 3 Oct 2022 10:40:05 +0200 (CEST)", "from mail-wr1-x432.google.com (mail-wr1-x432.google.com\n\t[IPv6:2a00:1450:4864:20::432])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A40E762CDF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 3 Oct 2022 10:40:00 +0200 (CEST)", "by mail-wr1-x432.google.com with SMTP id r6so15608835wru.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 03 Oct 2022 01:40:00 -0700 (PDT)", "from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\ti13-20020a5d55cd000000b0022ae59d472esm8922787wrw.112.2022.10.03.01.39.59\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 03 Oct 2022 01:39:59 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1664786405;\n\tbh=kdicR1GQ6QL/ACIu2H07yGwSFb41n8Xmz3VpXULzhe0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=HobMQPhJ3+TXgwpI9OybZTLK+DDCH7Gcxmp1NLANgiARYBCovq3yx0NnZJvZIE3jo\n\tlQMR7tBWqRgdMXfsgUFfivYX/xoAFl3e08UAXyOnHk9jpKa1dP2xJoFtyrXwnRgVlX\n\t6F2JfqcVAiohzze2uIa6m8mGEM3UcDdlmuKkg32USnERaQKpbsGmu+eX6CxuE19whl\n\tOuLae+8rpVbiHwatMNBAgBmb2XUrXgrJJ5JK/+QdbeNus3+rUY0MGWZOrXHO2FwObY\n\t3yNEj1eVVZ7ngS4Z3HJydufy0K4Xd6LYSRBBF9C0RV4Feh2fIOMsCZbFUW+WqwrihI\n\tdJ3Y1WASXdFIA==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date;\n\tbh=J3Pbv3t5I1/ZGMouVY4ib0G5AjvzkADTW/LkgrcjbCk=;\n\tb=ZtnrmQaQL6hc9PRPWch//fIlw7x1zar/IzszJQX25tl5GbDZQoBK/kmtILDD4S10EQ\n\teuJb+ULIkzCKirdtItilAT6nz+/jByXibcwfrKIsNsQH8c7rLCXi8pDsuJw9gC9i67B7\n\tgX6gPYVs/tAYO5nMDErJBojBSx76y/ad8u68l6xtLmknJtb7h3JBNTOEawn9N9SQQNoo\n\trwlCOIeqaCAIXh/ph2DnG4Ska4qDqN/h6W9iUln+lTixL2F105qOLp8yxCD0y9Ye7jCj\n\tq6QdCUApEHM6fxjR7BuH4O+CZjfOp59wnNc1/nfC6Z5QnETb5mXkyGp7HRnzx1i01vVG\n\tglaA==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"ZtnrmQaQ\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date;\n\tbh=J3Pbv3t5I1/ZGMouVY4ib0G5AjvzkADTW/LkgrcjbCk=;\n\tb=Rz40xwF27M0Riu369xRh1XrS3xfAHPshHhM6HmNq327oWuLypEvWxWJSOSy3ZWhXbo\n\twXFgeIiJ5XCDwxDJcVCLtN92GTvxRSdn7pqAkGYWY8Bghtq/EzTwxIV+DiTj09guHtAi\n\tzWzVmST++pkVsoLH+qTGKjkLDWmrrblrCRDtmiBAGkaiXytNUH2/mY+qJg6Q8NB3dBx7\n\tlzqOyXa+7Q05SNC1KTAqqy+P3XWBtIm4QYwt5FMPxG6b4ZSmR9LK8PCGtwrjcngusKu4\n\tQsd5PdwCnGZZDpGxY+d0LjbU9Ikmo8xaB/pZ4M+TvaJ8U/1MiVlGkIsZJNvcMyLGEBRd\n\t9JwA==", "X-Gm-Message-State": "ACrzQf3LeZ8rgnZeLUJDXH+wLPppozcfm9pbMSSo3ebYONBrPJ8uC3IT\n\ttVglD6fi1GL2eVMrp/46mm0BWqnTuYYFrw==", "X-Google-Smtp-Source": "AMsMyM7+W7Oq8RkVFyS+1VlM8GuFfUOsmWdPQxfXAmXgez/n5cZa7PRkJ4KAG0V4EbD/kYAUTIZbVQ==", "X-Received": "by 2002:a05:6000:18aa:b0:22a:b61d:877a with SMTP id\n\tb10-20020a05600018aa00b0022ab61d877amr12298312wri.512.1664786400018; \n\tMon, 03 Oct 2022 01:40:00 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 3 Oct 2022 09:39:30 +0100", "Message-Id": "<20221003083934.31629-5-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20221003083934.31629-1-naush@raspberrypi.com>", "References": "<20221003083934.31629-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v1 4/9] pipeline: ipa: raspberrypi: Add\n\tHBLANK control to DelayedControls", "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>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Update CamHelper::getDelays() to return the sensor HBLANK delay. The HBLANK\ndelay is set to the same value as VBLANK delay for all sensors in the Raspberry\nPi IPA.\n\nReturn the HBLANK gain delay from the IPA to the pipeline handler, and\ninitialise DelayedControls to handle V4L2_CID_HBLANK with this delay value.\n\nAs a drive-by, check that the V4L2_CID_HBLANK control is aviailable when calling\nIPARPi::configure().\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n include/libcamera/ipa/raspberrypi.mojom | 1 +\n src/ipa/raspberrypi/cam_helper.cpp | 3 ++-\n src/ipa/raspberrypi/cam_helper.h | 2 +-\n src/ipa/raspberrypi/cam_helper_imx290.cpp | 5 +++--\n src/ipa/raspberrypi/cam_helper_imx477.cpp | 5 +++--\n src/ipa/raspberrypi/cam_helper_imx519.cpp | 5 +++--\n src/ipa/raspberrypi/cam_helper_ov5647.cpp | 5 +++--\n src/ipa/raspberrypi/cam_helper_ov9281.cpp | 5 +++--\n src/ipa/raspberrypi/raspberrypi.cpp | 6 ++++--\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 1 +\n 10 files changed, 24 insertions(+), 14 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex c0de435b7b33..40f78d9e3b3f 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -23,6 +23,7 @@ struct SensorConfig {\n \tuint32 gainDelay;\n \tuint32 exposureDelay;\n \tuint32 vblankDelay;\n+\tuint32 hblankDelay;\n \tuint32 sensorMetadata;\n };\n \ndiff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp\nindex fd3527b94501..916632f83037 100644\n--- a/src/ipa/raspberrypi/cam_helper.cpp\n+++ b/src/ipa/raspberrypi/cam_helper.cpp\n@@ -114,7 +114,7 @@ void CamHelper::setCameraMode(const CameraMode &mode)\n }\n \n void CamHelper::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t int &vblankDelay) const\n+\t\t\t int &vblankDelay, int &hblankDelay) const\n {\n \t/*\n \t * These values are correct for many sensors. Other sensors will\n@@ -123,6 +123,7 @@ void CamHelper::getDelays(int &exposureDelay, int &gainDelay,\n \texposureDelay = 2;\n \tgainDelay = 1;\n \tvblankDelay = 2;\n+\thblankDelay = 2;\n }\n \n bool CamHelper::sensorEmbeddedDataPresent() const\ndiff --git a/src/ipa/raspberrypi/cam_helper.h b/src/ipa/raspberrypi/cam_helper.h\nindex 9b5e602689f3..1bbdd715d2b1 100644\n--- a/src/ipa/raspberrypi/cam_helper.h\n+++ b/src/ipa/raspberrypi/cam_helper.h\n@@ -88,7 +88,7 @@ public:\n \tvirtual uint32_t gainCode(double gain) const = 0;\n \tvirtual double gain(uint32_t gainCode) const = 0;\n \tvirtual void getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t int &vblankDelay) const;\n+\t\t\t int &vblankDelay, int &hblankDelay) const;\n \tvirtual bool sensorEmbeddedDataPresent() const;\n \tvirtual double getModeSensitivity(const CameraMode &mode) const;\n \tvirtual unsigned int hideFramesStartup() const;\ndiff --git a/src/ipa/raspberrypi/cam_helper_imx290.cpp b/src/ipa/raspberrypi/cam_helper_imx290.cpp\nindex 25f23d531c72..7d6f5b549a73 100644\n--- a/src/ipa/raspberrypi/cam_helper_imx290.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_imx290.cpp\n@@ -18,7 +18,7 @@ public:\n \tuint32_t gainCode(double gain) const override;\n \tdouble gain(uint32_t gainCode) const override;\n \tvoid getDelays(int &exposureDelay, int &gainDelay,\n-\t\t int &vblankDelay) const override;\n+\t\t int &vblankDelay, int &hblankDelay) const override;\n \tunsigned int hideFramesModeSwitch() const override;\n \n private:\n@@ -46,11 +46,12 @@ double CamHelperImx290::gain(uint32_t gainCode) const\n }\n \n void CamHelperImx290::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t\tint &vblankDelay) const\n+\t\t\t\tint &vblankDelay, int &hblankDelay) const\n {\n \texposureDelay = 2;\n \tgainDelay = 2;\n \tvblankDelay = 2;\n+\thblankDelay = 2;\n }\n \n unsigned int CamHelperImx290::hideFramesModeSwitch() const\ndiff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp\nindex 71529bdd3034..76a82cc51378 100644\n--- a/src/ipa/raspberrypi/cam_helper_imx477.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp\n@@ -49,7 +49,7 @@ public:\n \tuint32_t getVBlanking(Duration &exposure, Duration minFrameDuration,\n \t\t\t Duration maxFrameDuration) const override;\n \tvoid getDelays(int &exposureDelay, int &gainDelay,\n-\t\t int &vblankDelay) const override;\n+\t\t int &vblankDelay, int &hblankDelay) const override;\n \tbool sensorEmbeddedDataPresent() const override;\n \n private:\n@@ -153,11 +153,12 @@ uint32_t CamHelperImx477::getVBlanking(Duration &exposure,\n }\n \n void CamHelperImx477::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t\tint &vblankDelay) const\n+\t\t\t\tint &vblankDelay, int &hblankDelay) const\n {\n \texposureDelay = 2;\n \tgainDelay = 2;\n \tvblankDelay = 3;\n+\thblankDelay = 3;\n }\n \n bool CamHelperImx477::sensorEmbeddedDataPresent() const\ndiff --git a/src/ipa/raspberrypi/cam_helper_imx519.cpp b/src/ipa/raspberrypi/cam_helper_imx519.cpp\nindex 2c120dad1680..9dff1eeb899f 100644\n--- a/src/ipa/raspberrypi/cam_helper_imx519.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_imx519.cpp\n@@ -49,7 +49,7 @@ public:\n \tuint32_t getVBlanking(Duration &exposure, Duration minFrameDuration,\n \t\t\t Duration maxFrameDuration) const override;\n \tvoid getDelays(int &exposureDelay, int &gainDelay,\n-\t\t int &vblankDelay) const override;\n+\t\t int &vblankDelay, int &hblankDelay) const override;\n \tbool sensorEmbeddedDataPresent() const override;\n \n private:\n@@ -153,11 +153,12 @@ uint32_t CamHelperImx519::getVBlanking(Duration &exposure,\n }\n \n void CamHelperImx519::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t\tint &vblankDelay) const\n+\t\t\t\tint &vblankDelay, int &hblankDelay) const\n {\n \texposureDelay = 2;\n \tgainDelay = 2;\n \tvblankDelay = 3;\n+\thblankDelay = 3;\n }\n \n bool CamHelperImx519::sensorEmbeddedDataPresent() const\ndiff --git a/src/ipa/raspberrypi/cam_helper_ov5647.cpp b/src/ipa/raspberrypi/cam_helper_ov5647.cpp\nindex 04fb725d42db..5a99083dee78 100644\n--- a/src/ipa/raspberrypi/cam_helper_ov5647.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_ov5647.cpp\n@@ -18,7 +18,7 @@ public:\n \tuint32_t gainCode(double gain) const override;\n \tdouble gain(uint32_t gainCode) const override;\n \tvoid getDelays(int &exposureDelay, int &gainDelay,\n-\t\t int &vblankDelay) const override;\n+\t\t int &vblankDelay, int &hblankDelay) const override;\n \tunsigned int hideFramesStartup() const override;\n \tunsigned int hideFramesModeSwitch() const override;\n \tunsigned int mistrustFramesStartup() const override;\n@@ -53,7 +53,7 @@ double CamHelperOv5647::gain(uint32_t gainCode) const\n }\n \n void CamHelperOv5647::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t\tint &vblankDelay) const\n+\t\t\t\tint &vblankDelay, int &hblankDelay) const\n {\n \t/*\n \t * We run this sensor in a mode where the gain delay is bumped up to\n@@ -62,6 +62,7 @@ void CamHelperOv5647::getDelays(int &exposureDelay, int &gainDelay,\n \texposureDelay = 2;\n \tgainDelay = 2;\n \tvblankDelay = 2;\n+\thblankDelay = 2;\n }\n \n unsigned int CamHelperOv5647::hideFramesStartup() const\ndiff --git a/src/ipa/raspberrypi/cam_helper_ov9281.cpp b/src/ipa/raspberrypi/cam_helper_ov9281.cpp\nindex 66f56a31e1b8..86c5bc4c8fda 100644\n--- a/src/ipa/raspberrypi/cam_helper_ov9281.cpp\n+++ b/src/ipa/raspberrypi/cam_helper_ov9281.cpp\n@@ -18,7 +18,7 @@ public:\n \tuint32_t gainCode(double gain) const override;\n \tdouble gain(uint32_t gainCode) const override;\n \tvoid getDelays(int &exposureDelay, int &gainDelay,\n-\t\t int &vblankDelay) const override;\n+\t\t int &vblankDelay, int &hblankDelay) const override;\n \n private:\n \t/*\n@@ -49,12 +49,13 @@ double CamHelperOv9281::gain(uint32_t gainCode) const\n }\n \n void CamHelperOv9281::getDelays(int &exposureDelay, int &gainDelay,\n-\t\t\t\tint &vblankDelay) const\n+\t\t\t\tint &vblankDelay, int &hblankDelay) const\n {\n \t/* The driver appears to behave as follows: */\n \texposureDelay = 2;\n \tgainDelay = 2;\n \tvblankDelay = 2;\n+\thblankDelay = 2;\n }\n \n static CamHelper *create()\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 13807f4d47f7..9b0ad4361c97 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -219,13 +219,14 @@ int IPARPi::init(const IPASettings &settings, IPAInitResult *result)\n \t * Pass out the sensor config to the pipeline handler in order\n \t * to setup the staggered writer class.\n \t */\n-\tint gainDelay, exposureDelay, vblankDelay, sensorMetadata;\n-\thelper_->getDelays(exposureDelay, gainDelay, vblankDelay);\n+\tint gainDelay, exposureDelay, vblankDelay, hblankDelay, sensorMetadata;\n+\thelper_->getDelays(exposureDelay, gainDelay, vblankDelay, hblankDelay);\n \tsensorMetadata = helper_->sensorEmbeddedDataPresent();\n \n \tresult->sensorConfig.gainDelay = gainDelay;\n \tresult->sensorConfig.exposureDelay = exposureDelay;\n \tresult->sensorConfig.vblankDelay = vblankDelay;\n+\tresult->sensorConfig.hblankDelay = hblankDelay;\n \tresult->sensorConfig.sensorMetadata = sensorMetadata;\n \n \t/* Load the tuning file for this sensor. */\n@@ -607,6 +608,7 @@ bool IPARPi::validateSensorControls()\n \t\tV4L2_CID_ANALOGUE_GAIN,\n \t\tV4L2_CID_EXPOSURE,\n \t\tV4L2_CID_VBLANK,\n+\t\tV4L2_CID_HBLANK,\n \t};\n \n \tfor (auto c : ctrls) {\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex dcd81650c32d..623bec6bea3c 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1299,6 +1299,7 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me\n \tstd::unordered_map<uint32_t, DelayedControls::ControlParams> params = {\n \t\t{ V4L2_CID_ANALOGUE_GAIN, { result.sensorConfig.gainDelay, false } },\n \t\t{ V4L2_CID_EXPOSURE, { result.sensorConfig.exposureDelay, false } },\n+\t\t{ V4L2_CID_HBLANK, { result.sensorConfig.hblankDelay, false } },\n \t\t{ V4L2_CID_VBLANK, { result.sensorConfig.vblankDelay, true } }\n \t};\n \tdata->delayedCtrls_ = std::make_unique<DelayedControls>(data->sensor_->device(), params);\n", "prefixes": [ "libcamera-devel", "v1", "4/9" ] }