Patch Detail
Show a patch.
GET /api/1.1/patches/16195/?format=api
{ "id": 16195, "url": "https://patchwork.libcamera.org/api/1.1/patches/16195/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16195/", "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": "<20220610122533.11888-2-naush@raspberrypi.com>", "date": "2022-06-10T12:25:32", "name": "[libcamera-devel,2/3] pipeline: ipa: raspberrypi: Correctly report available control limits", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "9e641d5a94b63e99f8867e5598d7f872daa69b91", "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/16195/mbox/", "series": [ { "id": 3169, "url": "https://patchwork.libcamera.org/api/1.1/series/3169/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3169", "date": "2022-06-10T12:25:31", "name": "[libcamera-devel,1/3] pipeline: ipa: raspberrypi: Move ControlInfoMap to the IPA", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3169/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16195/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16195/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 30506C326B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 10 Jun 2022 12:25:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E034633A6;\n\tFri, 10 Jun 2022 14:25:30 +0200 (CEST)", "from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com\n\t[IPv6:2a00:1450:4864:20::32c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BE8FB633A6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Jun 2022 14:25:28 +0200 (CEST)", "by mail-wm1-x32c.google.com with SMTP id z17so8987850wmi.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Jun 2022 05:25:28 -0700 (PDT)", "from naush-laptop.localdomain ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\te29-20020a5d595d000000b00213b93cff5fsm23097909wri.98.2022.06.10.05.25.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 10 Jun 2022 05:25:27 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1654863930;\n\tbh=fbvK/Ak27dtZl3TEwoLt4TTFR3XDE3kvqgGiqHUfnmI=;\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=l4ZmidhfeJZuETEjcBx9xqPHqpJbwtetAdSksnUO8MPutcXuA6+6PHXYi9XzaMGoU\n\t3vcgB1krsigEng9T6utp6LyWO5Ndsg9B+mHEHxw+PTl1liCcuEVteSB6pI8/JEedIs\n\tvr2NI8ZVD7LYCnD1ppUIl6DtFqgWAYh58PbMFoe6JPzFwmFE97BwoSCLESK3KL0doH\n\tHSqNCLbtOMalv7BheeLOpz1VTF1AKjOw5v3c07TZVbafzMp7x5/gRAbDS7I0MgSYLb\n\twKjDmiVympQCyyr3OCL5kYq6gwt/64m3RBgQW5VxrjxflIVyAOGO5+DNESzAJDGTI5\n\tk0oH1U2VEJEDg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=wZA9/ttvFh+Mazt9dmmLKBj2nOFyAUFVT4YF0YKI6g0=;\n\tb=jKrkCgeFhsJLtd8e0I2gI2szkkjHT88MBFxskl6/lpCUjiPNMWUt6aW6SQoHRA4TXU\n\tiD1ZC8V1PK+LkJOyuhoth64+/pefTPFtsTOcEZogXhp3zWuPZDOHGr+oaFssw6vN27X6\n\t2jpEpscLGPsLLk7fqdld+DrccDh4SqXZfRGLjTbX3RTMPRXBGF92xzhughFoFQV2Pd54\n\tHUFvhjwkEBFr7yRA2cnEeK+kYAnI/niVYskDuZFKs5HO+n2euc18U06TGGcQbuyqj0YM\n\tTXGEvK5IVuazl//nxJy9+d6mp2ZNSVbi2JKJ3/6jKP5PLBCr8RzbS0njU8mQ4w0IpRIV\n\tdy/A==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"jKrkCgeF\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=wZA9/ttvFh+Mazt9dmmLKBj2nOFyAUFVT4YF0YKI6g0=;\n\tb=YwgrwO8D/Hx0s1HGS0glHhMr4tKHzF84/DWRcsWPZdFcjQOdhrsiGEyQg3V5gpsaRu\n\tMc6KzEaU/iLMVtj0taOFVJ+e3LOMzFzGaMX/MEuNBhsTE+fOtX+e7mf+FcxiDtjz5nrW\n\t8cq4p6TnV/Ej0o22A86eBSrbmqMQyMtB55Bz9GcF3qiDKKIuIFK8MErxiEpfBovBNkar\n\tqswiytZb/M8lPPg7Ow13kWSGSwGvRMBTN6Av1YImygNFyM7KdNGC4f2bk3W6Onj7FQsj\n\t2kgdFbdsCvrvaYivn8A6nz7C4gf9iGABwdawF44QJ1pQ57K04zdVXT4TiVzWt5LKmEo1\n\teTbQ==", "X-Gm-Message-State": "AOAM532qykvvPrX52D9ZuzXBxmGcETWGABQnAmSH7W9lS073h8KEk2cF\n\tHKTVKzsgght41ZS3UcJz8fa1hPpYSfKJCg==", "X-Google-Smtp-Source": "ABdhPJzCB11T0jtE8TwFfuZ3t0o6D1Ak9qBWQyMi2krbFeVqj3UPmMyuhEAThevd6EXZFjlBdfVECA==", "X-Received": "by 2002:a7b:c4cb:0:b0:39c:35b3:e8c1 with SMTP id\n\tg11-20020a7bc4cb000000b0039c35b3e8c1mr8413573wmk.183.1654863927995; \n\tFri, 10 Jun 2022 05:25:27 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 10 Jun 2022 13:25:32 +0100", "Message-Id": "<20220610122533.11888-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220610122533.11888-1-naush@raspberrypi.com>", "References": "<20220610122533.11888-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 2/3] pipeline: ipa: raspberrypi: Correctly\n\treport available control limits", "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": "The ipa currently advertises a static ControlInfoMap to specify the available\ncontrols and their limits. Fix this limitation by having the IPA populate a new\nControlInfoMap with updated limits for ExposureTime, AnalogueGain, and\nFrameDurationLimits controls based on the current sensor mode. This new\nControlInfoMap is then returned back to the pipeline handler and available to\nthe application after a successful Camera::Configure() call.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n include/libcamera/ipa/raspberrypi.mojom | 1 +\n src/ipa/raspberrypi/raspberrypi.cpp | 24 ++++++++++++++++---\n .../pipeline/raspberrypi/raspberrypi.cpp | 3 +++\n 3 files changed, 25 insertions(+), 3 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex 77f52c282b0f..c0de435b7b33 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -45,6 +45,7 @@ struct IPAConfig {\n \n struct IPAConfigResult {\n float modeSensitivity;\n+ libcamera.ControlInfoMap controlInfo;\n };\n \n struct StartConfig {\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 089528f5e126..295f6b735dc0 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -74,8 +74,6 @@ constexpr Duration controllerMinFrameDuration = 1.0s / 30.0;\n /* List of controls handled by the Raspberry Pi IPA */\n static const ControlInfoMap::Map ipaControls{\n \t{ &controls::AeEnable, ControlInfo(false, true) },\n-\t{ &controls::ExposureTime, ControlInfo(0, 999999) },\n-\t{ &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },\n \t{ &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },\n \t{ &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },\n \t{ &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) },\n@@ -89,7 +87,6 @@ static const ControlInfoMap::Map ipaControls{\n \t{ &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) },\n \t{ &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) },\n \t{ &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },\n-\t{ &controls::FrameDurationLimits, ControlInfo(INT64_C(1000), INT64_C(1000000000)) },\n \t{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }\n };\n \n@@ -446,6 +443,27 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n \tASSERT(controls);\n \t*controls = std::move(ctrls);\n \n+\t/*\n+\t * Apply the correct limits to the exposure, gain and frame duration controls\n+\t * based on the current sensor mode.\n+\t */\n+\tControlInfoMap::Map ctrlMap = ipaControls;\n+\tconst Duration minSensorFrameDuration = mode_.min_frame_length * mode_.line_length;\n+\tconst Duration maxSensorFrameDuration = mode_.max_frame_length * mode_.line_length;\n+\tctrlMap.emplace(&controls::FrameDurationLimits,\n+\t\t\tControlInfo(static_cast<int64_t>(minSensorFrameDuration.get<std::micro>()),\n+\t\t\t\t static_cast<int64_t>(maxSensorFrameDuration.get<std::micro>())));\n+\n+\tctrlMap.emplace(&controls::AnalogueGain,\n+\t\t\tControlInfo(1.0f, static_cast<float>(helper_->Gain(maxSensorGainCode_))));\n+\n+\tconst uint32_t exposureMin = sensorCtrls_.at(V4L2_CID_EXPOSURE).min().get<int32_t>();\n+\tconst uint32_t exposureMax = sensorCtrls_.at(V4L2_CID_EXPOSURE).max().get<int32_t>();\n+\tctrlMap.emplace(&controls::ExposureTime,\n+\t\t\tControlInfo(static_cast<int32_t>(helper_->Exposure(exposureMin).get<std::micro>()),\n+\t\t\t\t static_cast<int32_t>(helper_->Exposure(exposureMax).get<std::micro>())));\n+\n+\tresult->controlInfo = ControlInfoMap(std::move(ctrlMap), controls::controls);\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex d980c1a71dd8..4596f2babcea 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -940,6 +940,9 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t/* Store the mode sensitivity for the application. */\n \tdata->properties_.set(properties::SensorSensitivity, result.modeSensitivity);\n \n+\t/* Update the controls that the Raspberry Pi IPA can handle. */\n+\tdata->controlInfo_ = result.controlInfo;\n+\n \t/* Setup the Video Mux/Bridge entities. */\n \tfor (auto &[device, link] : data->bridgeDevices_) {\n \t\t/*\n", "prefixes": [ "libcamera-devel", "2/3" ] }