Patch Detail
Show a patch.
GET /api/1.1/patches/22530/?format=api
{ "id": 22530, "url": "https://patchwork.libcamera.org/api/1.1/patches/22530/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22530/", "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": "<20250113133405.12167-3-mzamazal@redhat.com>", "date": "2025-01-13T13:34:01", "name": "[v3,2/6] ipa: simple: softisp: Extend to pass metadata", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c86fcd477fcb401f261f8d9001b1d5a9820dfb23", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22530/mbox/", "series": [ { "id": 4945, "url": "https://patchwork.libcamera.org/api/1.1/series/4945/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4945", "date": "2025-01-13T13:33:59", "name": "ipa: simple: Introduce metadata reporting", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4945/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22530/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22530/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 38427C32F6\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 13 Jan 2025 13:34:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D419A6851C;\n\tMon, 13 Jan 2025 14:34:32 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BE9068521\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jan 2025 14:34:28 +0100 (CET)", "from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-198-9hV89oOrM-CcxJMjKHVYhA-1;\n\tMon, 13 Jan 2025 08:34:23 -0500", "from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 6B9A31979076; Mon, 13 Jan 2025 13:34:22 +0000 (UTC)", "from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.45.224.6])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 4EF701956056; Mon, 13 Jan 2025 13:34:20 +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=\"CJiv0Kp5\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1736775267;\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=k8ZZDVuQa0PhDq0rTEbhO0EpCmRO964RJWb0Px4kJyE=;\n\tb=CJiv0Kp51upoEDeL/GFZgT0GcfMRnhdv9+1qhUFQCHnc8acfDwg/4m0rgnlJmAuz2qCRWu\n\trHuu374OYgCVLRjMutNREpZf0wgYKHNBgYvtJFHzQ31T7G7Uk7PWPCYLGOE/bWyTAofeDC\n\ttVHIjjWyQGxBI+Pmelht4YJqKuJLppI=", "X-MC-Unique": "9hV89oOrM-CcxJMjKHVYhA-1", "X-Mimecast-MFC-AGG-ID": "9hV89oOrM-CcxJMjKHVYhA", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Kieran Bingham <kieran.bingham@ideasonboard.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>, =?utf-8?b?QmFybmFiw6FzIFDFkWN6?=\n\t=?utf-8?q?e?= <pobrn@protonmail.com>,\n\tMilan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH v3 2/6] ipa: simple: softisp: Extend to pass metadata", "Date": "Mon, 13 Jan 2025 14:34:01 +0100", "Message-ID": "<20250113133405.12167-3-mzamazal@redhat.com>", "In-Reply-To": "<20250113133405.12167-1-mzamazal@redhat.com>", "References": "<20250113133405.12167-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.17", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "xDq981pvYy-upUw2BR5MG519qQZeEefKUT4Pb5fXxms_1736775262", "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 | 35 +++++++++++++++----\n src/libcamera/software_isp/software_isp.cpp | 11 ++++++\n 5 files changed, 43 insertions(+), 13 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex d51b03fd..3d248aba 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -83,12 +83,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 d52e6f1a..934a6fd1 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 b26e4e15..944c644e 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -295,15 +295,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 123179b6..bb0ee23e 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,12 @@ private:\n \tvoid tryPipeline(unsigned int code, const Size &size);\n \tstatic std::vector<const MediaPad *> routedSourcePads(MediaPad *sink);\n \n-\tvoid completeRequest(Request *request);\n+\tvoid completeRequest(Request *request, bool checkCompleted);\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@@ -614,6 +617,7 @@ int SimpleCameraData::init()\n \t\t\t});\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@@ -859,7 +863,7 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t\t\t/* No conversion, just complete the request. */\n \t\t\tRequest *request = buffer->request();\n \t\t\tpipe->completeBuffer(request, buffer);\n-\t\t\tcompleteRequest(request);\n+\t\t\tcompleteRequest(request, false);\n \t\t\treturn;\n \t\t}\n \n@@ -877,7 +881,7 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t\tconst RequestOutputs &outputs = conversionQueue_.front();\n \t\tfor (auto &[stream, buf] : outputs.outputs)\n \t\t\tpipe->completeBuffer(outputs.request, buf);\n-\t\tcompleteRequest(outputs.request);\n+\t\tcompleteRequest(outputs.request, false);\n \t\tconversionQueue_.pop();\n \n \t\treturn;\n@@ -935,7 +939,7 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \n \t/* Otherwise simply complete the request. */\n \tpipe->completeBuffer(request, buffer);\n-\tcompleteRequest(request);\n+\tcompleteRequest(request, false);\n }\n \n void SimpleCameraData::clearIncompleteRequests()\n@@ -946,11 +950,17 @@ void SimpleCameraData::clearIncompleteRequests()\n \t}\n }\n \n-void SimpleCameraData::completeRequest(Request *request)\n+void SimpleCameraData::completeRequest(Request *request, bool checkCompleted)\n {\n+\tif (checkCompleted && request->hasPendingBuffers())\n+\t\treturn;\n+\n \tSimpleFrameInfo *info = frameInfo_.find(request);\n-\tif (info)\n+\tif (info) {\n+\t\tif (checkCompleted && !info->metadataProcessed)\n+\t\t\treturn;\n \t\tframeInfo_.destroy(info->frame);\n+\t}\n \tpipe()->completeRequest(request);\n }\n \n@@ -967,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\tcompleteRequest(request, true);\n }\n \n void SimpleCameraData::ispStatsReady(uint32_t frame, uint32_t bufferId)\n@@ -976,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+\tcompleteRequest(info->request, true);\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 2bea64d9..bd4c25cc 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -51,6 +51,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 are ready\n+ */\n+\n /**\n * \\var SoftwareIsp::setSensorControls\n * \\brief A signal emitted when the values to write to the sensor controls are\n@@ -136,6 +141,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t}\n \n \tipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams);\n+\tipa_->metadataReady.connect(this, &SoftwareIsp::saveMetadata);\n \tipa_->setSensorControls.connect(this, &SoftwareIsp::setSensorCtrls);\n \n \tdebayer_->moveToThread(&ispWorkerThread_);\n@@ -357,6 +363,11 @@ void SoftwareIsp::statsReady(uint32_t frame, uint32_t bufferId)\n \tispStatsReady.emit(frame, bufferId);\n }\n \n+void SoftwareIsp::saveMetadata(uint32_t frame, const ControlList &metadata)\n+{\n+\tmetadataReady.emit(frame, metadata);\n+}\n+\n void SoftwareIsp::inputReady(FrameBuffer *input)\n {\n \tinputBufferReady.emit(input);\n", "prefixes": [ "v3", "2/6" ] }