Patch Detail
Show a patch.
GET /api/patches/19278/?format=api
{ "id": 19278, "url": "https://patchwork.libcamera.org/api/patches/19278/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19278/", "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": "<20231204161901.6632-3-naush@raspberrypi.com>", "date": "2023-12-04T16:19:01", "name": "[libcamera-devel,v1,2/2] ipa: vc4: Implement the StatsOutputEnable vendor control", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a98bf0659f7732f0484d8784fc0de6e5e31417bd", "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/19278/mbox/", "series": [ { "id": 4099, "url": "https://patchwork.libcamera.org/api/series/4099/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4099", "date": "2023-12-04T16:18:59", "name": "Raspberry Pi vendor controls", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4099/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19278/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19278/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 A97C6C3226\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 4 Dec 2023 16:18:51 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D41BE629D6;\n\tMon, 4 Dec 2023 17:18:50 +0100 (CET)", "from mail-ej1-x634.google.com (mail-ej1-x634.google.com\n\t[IPv6:2a00:1450:4864:20::634])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 55F7A629CF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 4 Dec 2023 17:18:49 +0100 (CET)", "by mail-ej1-x634.google.com with SMTP id\n\ta640c23a62f3a-a0029289b1bso603999966b.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 04 Dec 2023 08:18:49 -0800 (PST)", "from localhost.localdomain ([188.39.149.98])\n\tby smtp.gmail.com with ESMTPSA id\n\tg5-20020a170906198500b009c5c5c2c5a4sm5445134ejd.219.2023.12.04.08.18.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 04 Dec 2023 08:18:47 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1701706730;\n\tbh=XCNQAjyiCKSxnl5IWKcZDrrgC0QxdTKi+qvoTnnl+f8=;\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=1K01OK5b+IsfZqpV/RtO7H/JRtkIDABLkgg4+Bhpb0TpqMdPcgIhZOCi6HDrWNm4E\n\tjkhzLWTWmLTjdK45Az1AewQLqyAlJKjHD79LDBLU0zlZJvKwhSlNV+jcIMGECC+FWv\n\tM0S6KvOZ4Zxl9yIq9+303dqEpsfkgMH6zG1xHcmuQba430GnF7scz/QPq483/ljM6a\n\tlfIc/rzwwlNh53c5nTlcQTm9aNfEIcbpS5f5/X9QERorcfkU8UANxzdBxlxmY0JouX\n\toLcqEppwe5ceiNQ5yVHqHPv7r/U2dRQMR5k0tqFZes/vZ9mgiuoaODg2VLxNeHdr0S\n\tsQWKh8gFHPkEw==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1701706728; x=1702311528;\n\tdarn=lists.libcamera.org; \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\t:message-id:reply-to;\n\tbh=HTKr+T3yK1rgst9SoGWu8BhqjJkOk+nmHY9N+xMaOlI=;\n\tb=JcP2QhPFT7hjEX4clRXl4/cnBW4HHoUW+KkkFh7DWOVif1yxSiNZtPudRfV8ZxTFry\n\tMvrOB+bru0Tno7L/Tjp/xCvhgof8UN4FobNStpcocTcfgPZ6AJ0p7+6bnIB3zTF/0AyS\n\tIkpqnyRImXJEgY9nWbJEnrTq0tDvN/g7yJCNs+DYv8M6cGLpDs8GxieFC7obmi6zEpOm\n\tomt/H0E3hNyR6H0WmASzTwRebb7Can7Xyk8xfNyWTHKA9T27v527/2pQoNSgBOUiVAKi\n\t2FR4b3cbrZaLXP/TaH6mQrao5btbmuhEcj0TQ+9uKKsJrODQoem5ozH445Akd0F/UUwr\n\tgIIA==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"JcP2QhPF\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1701706728; x=1702311528;\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:message-id:reply-to;\n\tbh=HTKr+T3yK1rgst9SoGWu8BhqjJkOk+nmHY9N+xMaOlI=;\n\tb=MkdqIlkF2osqDggsdN36gOUnW0lYC0kujkaktOjdg9E6iicp7ZVXW2HEcNEBXy4rgB\n\tyw64ysj3Du3S3bKH4X61iazRjRCPYMqTjTnRDaXmYVqXqWo6lHEfckUcGQdtcgDINafD\n\tTDnHcYamUCm7jcGFewL3MkYXs9Tie6/YEQNlNmwHBVX2Jo8CBoRuvDeztNFlgXd8wBaQ\n\tEBRc7Tl8RpAt/yZGsQRsb4hO/GBT1tCVlg+HLWHdQ+Cpu3XBs6+SJEx7gA1FLXDlOQON\n\tWmkoySkOLDRZ+fIlJ8GJOdlX278tWN3cCUnrZOzKTY/irmy2gfCOImiBhw9DWWXi106P\n\tU2oQ==", "X-Gm-Message-State": "AOJu0Yx6dBzrFnELSd5q7jeAMr5SM4y8/YOxFHiwGYIDWiRqrMOwwvO1\n\tGqxcFikqG6hx2VWhtgOhJFXbMC3pg17F7T+MTDXrbw==", "X-Google-Smtp-Source": "AGHT+IGPnyz4/ZmaghAgy/EXyMdi/Jyqxfv1Do+nDWAhv7cwmhFz2S14b71AO983ZrxznD0wR6b3AQ==", "X-Received": "by 2002:a17:906:e12:b0:a18:bb79:9a0 with SMTP id\n\tl18-20020a1709060e1200b00a18bb7909a0mr3349352eji.58.1701706728510; \n\tMon, 04 Dec 2023 08:18:48 -0800 (PST)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 4 Dec 2023 16:19:01 +0000", "Message-Id": "<20231204161901.6632-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20231204161901.6632-1-naush@raspberrypi.com>", "References": "<20231204161901.6632-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v1 2/2] ipa: vc4: Implement the\n\tStatsOutputEnable vendor control", "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": "Implement the StatsOutputEnable control for the VC4 IPA. When set,\nthis outputs the ISP statistics as a uint8_t span through the Bcm2835StatsOutput\nmetadata control.\n\nTo get this working, IpaBase::libcameraMetadata_ is moved from a private\nto a protected member variable. This makes it accessable to the VC4\nderived IPA class.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n src/ipa/rpi/common/ipa_base.cpp | 12 +++++++++---\n src/ipa/rpi/common/ipa_base.h | 3 ++-\n src/ipa/rpi/vc4/vc4.cpp | 6 ++++++\n 3 files changed, 17 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex 6ac9d5de2f88..c4d17a2130c8 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -70,7 +70,8 @@ const ControlInfoMap::Map ipaControls{\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::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }\n+\t{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n+\t{ &controls::rpi::StatsOutputEnable, ControlInfo(false, true) },\n };\n \n /* IPA controls handled conditionally, if the sensor is not mono */\n@@ -100,8 +101,9 @@ LOG_DEFINE_CATEGORY(IPARPI)\n namespace ipa::RPi {\n \n IpaBase::IpaBase()\n-\t: controller_(), frameLengths_(FrameLengthsQueueSize, 0s), frameCount_(0),\n-\t mistrustCount_(0), lastRunTimestamp_(0), firstStart_(true), flickerState_({ 0, 0s })\n+\t: controller_(), frameLengths_(FrameLengthsQueueSize, 0s), statsMetadataOutput_(false),\n+\t frameCount_(0), mistrustCount_(0), lastRunTimestamp_(0), firstStart_(true),\n+\t flickerState_({ 0, 0s })\n {\n }\n \n@@ -1135,6 +1137,10 @@ void IpaBase::applyControls(const ControlList &controls)\n \t\t\tbreak;\n \t\t}\n \n+\t\tcase controls::rpi::STATS_OUTPUT_ENABLE:\n+\t\t\tstatsMetadataOutput_ = ctrl.second.get<bool>();\n+\t\t\tbreak;\n+\n \t\tdefault:\n \t\t\tLOG(IPARPI, Warning)\n \t\t\t\t<< \"Ctrl \" << controls::controls.at(ctrl.first)->name()\ndiff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h\nindex eaa9f71182ed..4db4411eed7c 100644\n--- a/src/ipa/rpi/common/ipa_base.h\n+++ b/src/ipa/rpi/common/ipa_base.h\n@@ -61,6 +61,8 @@ protected:\n \t/* Track the frame length times over FrameLengthsQueueSize frames. */\n \tstd::deque<utils::Duration> frameLengths_;\n \tutils::Duration lastTimeout_;\n+\tControlList libcameraMetadata_;\n+\tbool statsMetadataOutput_;\n \n private:\n \t/* Number of metadata objects available in the context list. */\n@@ -89,7 +91,6 @@ private:\n \n \tbool lensPresent_;\n \tbool monoSensor_;\n-\tControlList libcameraMetadata_;\n \n \tstd::array<RPiController::Metadata, numMetadataContexts> rpiMetadata_;\n \ndiff --git a/src/ipa/rpi/vc4/vc4.cpp b/src/ipa/rpi/vc4/vc4.cpp\nindex c165a5b8b0b6..ccd4141943dd 100644\n--- a/src/ipa/rpi/vc4/vc4.cpp\n+++ b/src/ipa/rpi/vc4/vc4.cpp\n@@ -11,6 +11,7 @@\n #include <linux/bcm2835-isp.h>\n \n #include <libcamera/base/log.h>\n+#include <libcamera/base/span.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/ipa/ipa_module_info.h>\n \n@@ -245,6 +246,11 @@ RPiController::StatisticsPtr IpaVc4::platformProcessStats(Span<uint8_t> mem)\n \t\t\t\t\t\t stats->focus_stats[i].contrast_val_num[1][1],\n \t\t\t\t\t\t stats->focus_stats[i].contrast_val_num[1][0] });\n \n+\tif (statsMetadataOutput_) {\n+\t\tSpan<uint8_t> statsSpan((uint8_t *)(stats), sizeof(bcm2835_isp_stats));\n+\t\tlibcameraMetadata_.set(controls::rpi::Bcm2835StatsOutput, statsSpan);\n+\t}\n+\n \treturn statistics;\n }\n \n", "prefixes": [ "libcamera-devel", "v1", "2/2" ] }