Patch Detail
Show a patch.
GET /api/patches/23049/?format=api
{ "id": 23049, "url": "https://patchwork.libcamera.org/api/patches/23049/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23049/", "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": "<20250326124856.75709-3-mzamazal@redhat.com>", "date": "2025-03-26T12:48:51", "name": "[v5,2/6] ipa: simple: softisp: Extend to pass metadata", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "064a2d8269a2f170cd3c1fc30b0a7fb48ee1dbde", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23049/mbox/", "series": [ { "id": 5085, "url": "https://patchwork.libcamera.org/api/series/5085/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5085", "date": "2025-03-26T12:48:49", "name": "ipa: simple: Introduce metadata reporting", "version": 5, "mbox": "https://patchwork.libcamera.org/series/5085/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23049/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23049/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 E4074C3213\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 26 Mar 2025 12:49:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9601E68973;\n\tWed, 26 Mar 2025 13:49:13 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3AF7468950\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 26 Mar 2025 13:49:11 +0100 (CET)", "from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-115-y1ol76bXOFuq3dToocBjhg-1;\n\tWed, 26 Mar 2025 08:49:06 -0400", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 70102180AF56; Wed, 26 Mar 2025 12:49:05 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.34.15])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id E79C630001A1; Wed, 26 Mar 2025 12:49:03 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"PmqlpqVb\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1742993350;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=kCQ8WKo50d9iz+K9QyKS/uB/T/B/IEndfTAIyagfGBE=;\n\tb=PmqlpqVbVtBPtBnYBBpvFgGtmxuym2q3nadHxvvniXtPSP3s7bIB8eLzY3ulGGT+Xv9VF1\n\tSx/AJm2J0TERct6RI54MBCzSqhXpExw9JZOkDAifpvFkeV4mPSApf2jlAuGVAlmCeXLxiV\n\tUaarCXHyUsjQkSuF3nPunJB2bsMT6ts=", "X-MC-Unique": "y1ol76bXOFuq3dToocBjhg-1", "X-Mimecast-MFC-AGG-ID": "y1ol76bXOFuq3dToocBjhg_1742993345", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tMilan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH v5 2/6] ipa: simple: softisp: Extend to pass metadata", "Date": "Wed, 26 Mar 2025 13:48:51 +0100", "Message-ID": "<20250326124856.75709-3-mzamazal@redhat.com>", "In-Reply-To": "<20250326124856.75709-1-mzamazal@redhat.com>", "References": "<20250326124856.75709-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "W52Tajnbs1KqZ9o1Q8_xpg6fUq38FH63iNl5MViXgU4_1742993345", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nExtend the Simple IPA IPC to support returning a metadata ControlList\nwhen the process call has completed.\n\nA new signal from the IPA is introduced to report the metadata,\nsimilarly to what the hardware pipelines do.\n\nMerge the metadata reported by the ISP into any completing request to\nprovide to the application. Completion of a request is delayed until\nthis is done; this doesn't apply to canceled requests.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../internal/software_isp/software_isp.h | 2 ++\n include/libcamera/ipa/soft.mojom | 1 +\n src/ipa/simple/soft_simple.cpp | 7 +---\n src/libcamera/pipeline/simple/simple.cpp | 33 ++++++++++++++++++-\n src/libcamera/software_isp/software_isp.cpp | 9 +++++\n 5 files changed, 45 insertions(+), 7 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex 0026cec2..1ee37dc7 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -85,12 +85,14 @@ public:\n \tSignal<FrameBuffer *> inputBufferReady;\n \tSignal<FrameBuffer *> outputBufferReady;\n \tSignal<uint32_t, uint32_t> ispStatsReady;\n+\tSignal<uint32_t, const ControlList &> metadataReady;\n \tSignal<const ControlList &> setSensorControls;\n \n private:\n \tvoid saveIspParams();\n \tvoid setSensorCtrls(const ControlList &sensorControls);\n \tvoid statsReady(uint32_t frame, uint32_t bufferId);\n+\tvoid saveMetadata(uint32_t frame, const ControlList &metadata);\n \tvoid inputReady(FrameBuffer *input);\n \tvoid outputReady(FrameBuffer *output);\n \ndiff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\nindex ede74413..a8e6ecda 100644\n--- a/include/libcamera/ipa/soft.mojom\n+++ b/include/libcamera/ipa/soft.mojom\n@@ -33,4 +33,5 @@ interface IPASoftInterface {\n interface IPASoftEventInterface {\n \tsetSensorControls(libcamera.ControlList sensorControls);\n \tsetIspParams();\n+\tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n };\ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex a87c6cdd..4ef67c43 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -299,15 +299,10 @@ void IPASoftSimple::processStats(const uint32_t frame,\n \tint32_t again = sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>();\n \tframeContext.sensor.gain = camHelper_ ? camHelper_->gain(again) : again;\n \n-\t/*\n-\t * Software ISP currently does not produce any metadata. Use an empty\n-\t * ControlList for now.\n-\t *\n-\t * \\todo Implement proper metadata handling\n-\t */\n \tControlList metadata(controls::controls);\n \tfor (auto const &algo : algorithms())\n \t\talgo->process(context_, frame, frameContext, stats_, metadata);\n+\tmetadataReady.emit(frame, metadata);\n \n \t/* Sanity check */\n \tif (!sensorControls.contains(V4L2_CID_EXPOSURE) ||\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 2281c0a6..f34df926 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -184,6 +184,7 @@ class SimplePipelineHandler;\n struct SimpleFrameInfo {\n \tuint32_t frame;\n \tRequest *request;\n+\tbool metadataProcessed;\n };\n \n class SimpleFrames\n@@ -207,6 +208,7 @@ void SimpleFrames::create(Request *request)\n \tASSERT(inserted);\n \tit->second.frame = frame;\n \tit->second.request = request;\n+\tit->second.metadataProcessed = false;\n }\n \n void SimpleFrames::destroy(uint32_t frame)\n@@ -357,11 +359,13 @@ private:\n \tvoid tryPipeline(unsigned int code, const Size &size);\n \tstatic std::vector<const MediaPad *> routedSourcePads(MediaPad *sink);\n \n+\tvoid tryCompleteRequest(Request *request);\n \tvoid completeRequest(Request *request);\n \tvoid conversionInputDone(FrameBuffer *buffer);\n \tvoid conversionOutputDone(FrameBuffer *buffer);\n \n \tvoid ispStatsReady(uint32_t frame, uint32_t bufferId);\n+\tvoid metadataReady(uint32_t frame, const ControlList &metadata);\n \tvoid setSensorControls(const ControlList &sensorControls);\n };\n \n@@ -600,6 +604,7 @@ int SimpleCameraData::init()\n \t\t\tswIsp_->inputBufferReady.connect(this, &SimpleCameraData::conversionInputDone);\n \t\t\tswIsp_->outputBufferReady.connect(this, &SimpleCameraData::conversionOutputDone);\n \t\t\tswIsp_->ispStatsReady.connect(this, &SimpleCameraData::ispStatsReady);\n+\t\t\tswIsp_->metadataReady.connect(this, &SimpleCameraData::metadataReady);\n \t\t\tswIsp_->setSensorControls.connect(this, &SimpleCameraData::setSensorControls);\n \t\t}\n \t}\n@@ -932,6 +937,21 @@ void SimpleCameraData::clearIncompleteRequests()\n \t}\n }\n \n+void SimpleCameraData::tryCompleteRequest(Request *request)\n+{\n+\tif (request->hasPendingBuffers())\n+\t\treturn;\n+\n+\tSimpleFrameInfo *info = frameInfo_.find(request);\n+\tif (!info)\n+\t\treturn;\n+\n+\tif (!info->metadataProcessed)\n+\t\treturn;\n+\n+\tcompleteRequest(request);\n+}\n+\n void SimpleCameraData::completeRequest(Request *request)\n {\n \tSimpleFrameInfo *info = frameInfo_.find(request);\n@@ -957,7 +977,7 @@ void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer)\n \t/* Complete the buffer and the request. */\n \tRequest *request = buffer->request();\n \tif (pipe->completeBuffer(request, buffer))\n-\t\tcompleteRequest(request);\n+\t\ttryCompleteRequest(request);\n }\n \n void SimpleCameraData::ispStatsReady(uint32_t frame, uint32_t bufferId)\n@@ -966,6 +986,17 @@ void SimpleCameraData::ispStatsReady(uint32_t frame, uint32_t bufferId)\n \t\t\t delayedCtrls_->get(frame));\n }\n \n+void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata)\n+{\n+\tSimpleFrameInfo *info = frameInfo_.find(frame);\n+\tif (!info)\n+\t\treturn;\n+\n+\tinfo->request->metadata().merge(metadata);\n+\tinfo->metadataProcessed = true;\n+\ttryCompleteRequest(info->request);\n+}\n+\n void SimpleCameraData::setSensorControls(const ControlList &sensorControls)\n {\n \tdelayedCtrls_->push(sensorControls);\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 4a74dcb6..6baa3fec 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -55,6 +55,11 @@ LOG_DEFINE_CATEGORY(SoftwareIsp)\n * \\brief A signal emitted when the statistics for IPA are ready\n */\n \n+/**\n+ * \\var SoftwareIsp::metadataReady\n+ * \\brief A signal emitted when the metadata for IPA is ready\n+ */\n+\n /**\n * \\var SoftwareIsp::setSensorControls\n * \\brief A signal emitted when the values to write to the sensor controls are\n@@ -141,6 +146,10 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t}\n \n \tipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams);\n+\tipa_->metadataReady.connect(this,\n+\t\t\t\t [this](uint32_t frame, const ControlList &metadata) {\n+\t\t\t\t\t metadataReady.emit(frame, metadata);\n+\t\t\t\t });\n \tipa_->setSensorControls.connect(this, &SoftwareIsp::setSensorCtrls);\n \n \tdebayer_->moveToThread(&ispWorkerThread_);\n", "prefixes": [ "v5", "2/6" ] }