Patch Detail
Show a patch.
GET /api/patches/22775/?format=api
{ "id": 22775, "url": "https://patchwork.libcamera.org/api/patches/22775/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22775/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20250211102327.55021-1-naush@raspberrypi.com>", "date": "2025-02-11T10:20:02", "name": "[v3] ipa: rpi: Apply default ControlInfo values for sensor controls", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e3110137cd6f3331be9088ca9f3daa7d87e3dcf8", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22775/mbox/", "series": [ { "id": 4997, "url": "https://patchwork.libcamera.org/api/series/4997/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4997", "date": "2025-02-11T10:20:02", "name": "[v3] ipa: rpi: Apply default ControlInfo values for sensor controls", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4997/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22775/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22775/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 4B99CBD1F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 11 Feb 2025 10:23:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 542E768621;\n\tTue, 11 Feb 2025 11:23:32 +0100 (CET)", "from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2247E61865\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 11 Feb 2025 11:23:30 +0100 (CET)", "by mail-wm1-x32d.google.com with SMTP id\n\t5b1f17b1804b1-43938828d02so4068075e9.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 11 Feb 2025 02:23:30 -0800 (PST)", "from NAUSH-P-DELL.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-4390d96530fsm204084075e9.19.2025.02.11.02.23.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 11 Feb 2025 02:23:28 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"G6BK+sMg\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1739269409; x=1739874209;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:from:to:cc:subject:date:message-id:reply-to;\n\tbh=4dyl7xP7Mrndp9vkgsdnkXWXMyudrHUKqaOZdrZf6o4=;\n\tb=G6BK+sMg5GyQ7vq5OonXzoQGhDsr8NCpZIbTkYmh15mLCVSbTUuHG8BnBJSUg454ll\n\tvq3Cua6rYL035qnmPKEP18VmdkClg+9iqxQYeSO9uOr9Kjy1nXEwynMldGJqog/GaJ4K\n\tCk2hnxMrL0u/Uif60aP5WSbvkzV1ylQ6hKayGPDYKDIjbipV5M4ySD02iZRnvNKFtA6m\n\t516zCgLGmIwl2cO+XBvEuq/A7ecuDX9tmxJA25jOsh2yEXCZjlXYgb2C3WHLa1jyv3O5\n\tI1J1Ra139UmnQ5qVmPcZQrTi8sdmZjYM8BmB7JpMa9qVAcMX6Moy8uERahv5BjxoU7+Y\n\txPDg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1739269409; x=1739874209;\n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=4dyl7xP7Mrndp9vkgsdnkXWXMyudrHUKqaOZdrZf6o4=;\n\tb=ebtlsS9Wg03zDosq5Elxy8ntXOGXSRqzqzC2KmdzqFnKvvaz4ZshDYWhnedn/rQlDZ\n\tQdubHRrdUNQWIxKh1iIez8oLQ/bgzGjvPwEleK/lvYEUcELTUj4AbLz8lDy9hEpPKCAB\n\t3mlBUsrn7iKPGWSs87by0M0WT+0bIHbBuzzLv+17ytxYokY3SoPQXgKG1l2ccsImklQQ\n\t6TnfW/KZhPXyqc4RlXiPePJcB9iJqZxwlNPCYDl96Dm6AFUWokjTpZ6ODZt78WJzvIpF\n\tv2d3J/RGeFkVuDeroh6gkVzH7cNbC53PxUXEVMfYwJqXsDadI1oBrYeQTryF4JeH4wwZ\n\tjfrQ==", "X-Gm-Message-State": "AOJu0Yy3VpOLlO06zPoOLGjzBkc0XMXlqw+0nQhgMUoCn1FEDn18pKX0\n\ttQ6OyVJr/Z5ren95nP/8/buzkQA4JPaVclE3vI3O64TMW8nOqAO25PJKwF9FyPZIq/9NRdcnUin\n\tB8Dk=", "X-Gm-Gg": "ASbGncv4BXsWAg3vyUDpIq3PodHt9Qf8FdL5TD5dZu6tPMW/daTpjBjrvbL6m+h16Rw\n\tTLe2udClJ4eHyzM7YUoi9XTwQu3mRLoL2NuPthB8v+Y7S1uE8o4Aqkr8a4UHB8+hZlgj6w3Nh+W\n\th/00oAQyJpXlrLW4A1ebN+tNFbjZevNEJNDhNGqI06EO1NncGhsNyAB20QroGc2Dfn7MS1V1D57\n\t+99hjbq0REekqVjyuchlCVKal4HM61GpG+M5CqDPehuoeNThMGLKSpT3DyaknjH97slnGjXSbRy\n\twURzU/jl7pO1iTM2H5dfwUMD6hrTh3OY97M=", "X-Google-Smtp-Source": "AGHT+IEpZQNacMOi8+IoOCozeqD/mjT20oPUQG/WsyVoCWSDnieLLPzxWteXNptmY5JqaJfoHdhA/w==", "X-Received": "by 2002:a05:600c:4fd5:b0:439:4a36:ab7 with SMTP id\n\t5b1f17b1804b1-4394dc02d8fmr7148235e9.1.1739269409090; \n\tTue, 11 Feb 2025 02:23:29 -0800 (PST)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Naushir Patuck <naush@raspberrypi.com>,\n\tDavid Plowman <david.plowman@raspberrypi.com>", "Subject": "[PATCH v3] ipa: rpi: Apply default ControlInfo values for sensor\n\tcontrols", "Date": "Tue, 11 Feb 2025 10:20:02 +0000", "Message-ID": "<20250211102327.55021-1-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.43.0", "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": "The existing IPA initialisation code did not set default values for\nsome sensor related controls. This caused a crash using libcamerify\nwhen the it was trying to access the default value for\ncontrols::FrameDurationLimits as part of a recent change.\n\nEnsure controls::FrameDurationLimits, controls::AnalogueGain and\ncontrols::ExposureTime advertise default values along with the existing\nmin/max values. The default is set to the defaults defined in the IPA\nset during initialisation.\n\nBug: https://bugs.libcamera.org/show_bug.cgi?id=253\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\n---\n\nChanges in v3:\n\nNeed to apply the same default in the init phase since the test in the\nV4L2CameraProxy::setFmtFromConfig() happens before calling ipa::configure().\n\n---\n src/ipa/rpi/common/ipa_base.cpp | 18 ++++++++++++------\n 1 file changed, 12 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex bd3c22000df5..5d2c6d40da3e 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -61,12 +61,13 @@ const ControlInfoMap::Map ipaControls{\n \t ControlInfo(static_cast<int32_t>(controls::ExposureTimeModeAuto),\n \t\t static_cast<int32_t>(controls::ExposureTimeModeManual),\n \t\t static_cast<int32_t>(controls::ExposureTimeModeAuto)) },\n-\t{ &controls::ExposureTime, ControlInfo(0, 66666) },\n+\t{ &controls::ExposureTime,\n+\t ControlInfo(1, 66666, static_cast<int64_t>(defaultExposureTime.get<std::micro>())) },\n \t{ &controls::AnalogueGainMode,\n \t ControlInfo(static_cast<int32_t>(controls::AnalogueGainModeAuto),\n \t\t static_cast<int32_t>(controls::AnalogueGainModeManual),\n \t\t static_cast<int32_t>(controls::AnalogueGainModeAuto)) },\n-\t{ &controls::AnalogueGain, ControlInfo(1.0f, 16.0f) },\n+\t{ &controls::AnalogueGain, ControlInfo(1.0f, 16.0f, 1.0f) },\n \t{ &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },\n \t{ &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },\n \t{ &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) },\n@@ -80,7 +81,9 @@ const ControlInfoMap::Map ipaControls{\n \t{ &controls::HdrMode, ControlInfo(controls::HdrModeValues) },\n \t{ &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) },\n \t{ &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },\n-\t{ &controls::FrameDurationLimits, ControlInfo(INT64_C(33333), INT64_C(120000)) },\n+\t{ &controls::FrameDurationLimits,\n+\t ControlInfo(INT64_C(33333), INT64_C(120000),\n+\t \t static_cast<int64_t>(defaultMinFrameDuration.get<std::micro>())) },\n \t{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n \t{ &controls::rpi::StatsOutputEnable, ControlInfo(false, true, false) },\n };\n@@ -259,15 +262,18 @@ int32_t IpaBase::configure(const IPACameraSensorInfo &sensorInfo, const ConfigPa\n \tControlInfoMap::Map ctrlMap = ipaControls;\n \tctrlMap[&controls::FrameDurationLimits] =\n \t\tControlInfo(static_cast<int64_t>(mode_.minFrameDuration.get<std::micro>()),\n-\t\t\t static_cast<int64_t>(mode_.maxFrameDuration.get<std::micro>()));\n+\t\t\t static_cast<int64_t>(mode_.maxFrameDuration.get<std::micro>()),\n+\t\t\t static_cast<int64_t>(defaultMinFrameDuration.get<std::micro>()));\n \n \tctrlMap[&controls::AnalogueGain] =\n \t\tControlInfo(static_cast<float>(mode_.minAnalogueGain),\n-\t\t\t static_cast<float>(mode_.maxAnalogueGain));\n+\t\t\t static_cast<float>(mode_.maxAnalogueGain),\n+\t\t\t static_cast<float>(defaultAnalogueGain));\n \n \tctrlMap[&controls::ExposureTime] =\n \t\tControlInfo(static_cast<int32_t>(mode_.minExposureTime.get<std::micro>()),\n-\t\t\t static_cast<int32_t>(mode_.maxExposureTime.get<std::micro>()));\n+\t\t\t static_cast<int32_t>(mode_.maxExposureTime.get<std::micro>()),\n+\t\t\t static_cast<int32_t>(defaultExposureTime.get<std::micro>()));\n \n \t/* Declare colour processing related controls for non-mono sensors. */\n \tif (!monoSensor_)\n", "prefixes": [ "v3" ] }