Patch Detail
Show a patch.
GET /api/1.1/patches/23059/?format=api
{ "id": 23059, "url": "https://patchwork.libcamera.org/api/1.1/patches/23059/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23059/", "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": "<20250327185945.159481-2-mzamazal@redhat.com>", "date": "2025-03-27T18:59:39", "name": "[v6,1/6] libcamera: software_isp: Track frames and requests", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d79764ea7667efdf27deb0a6f1264e2b12b171ab", "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/23059/mbox/", "series": [ { "id": 5087, "url": "https://patchwork.libcamera.org/api/1.1/series/5087/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5087", "date": "2025-03-27T18:59:38", "name": "ipa: simple: Introduce metadata reporting", "version": 6, "mbox": "https://patchwork.libcamera.org/series/5087/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23059/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23059/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 846A7C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 Mar 2025 19:00:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 33DF26897D;\n\tThu, 27 Mar 2025 20:00:02 +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 F353C68947\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Mar 2025 19:59:59 +0100 (CET)", "from mx-prod-mc-04.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-619-PZ9Cuq8tMoqFfzT7b8gORQ-1;\n\tThu, 27 Mar 2025 14:59:57 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 5F95018EBE8F; Thu, 27 Mar 2025 18:59:56 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.17])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 95B7230001A1; Thu, 27 Mar 2025 18:59:54 +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=\"iVEwoiiy\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1743101998;\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=TZRnrsWgi1XCphjvEgBR7IF0WE3NXR5ai2CXVj99ojo=;\n\tb=iVEwoiiyG/oZXGMnHxaA0ZwvBOYMe6WPj5iYnBzWrCxa9pu+HQlQ55DkcXUnIe181vnp3C\n\tKO9FmO6atydjKrcmnqXqA0iKrHwZ9lOPhrkeLRkM8Qs16jPIlDCL3720In095ZcMEiE3Y1\n\t3fCDDn0E3vIklwNvzaleZ7GWZtvr1IE=", "X-MC-Unique": "PZ9Cuq8tMoqFfzT7b8gORQ-1", "X-Mimecast-MFC-AGG-ID": "PZ9Cuq8tMoqFfzT7b8gORQ_1743101996", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v6 1/6] libcamera: software_isp: Track frames and requests", "Date": "Thu, 27 Mar 2025 19:59:39 +0100", "Message-ID": "<20250327185945.159481-2-mzamazal@redhat.com>", "In-Reply-To": "<20250327185945.159481-1-mzamazal@redhat.com>", "References": "<20250327185945.159481-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": "yFfhjKwAeOWwaO-mt-beWDdpdWkR0ALE6AHawQtoY5A_1743101996", "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": "Hardware pipelines track requests and other information related to\nparticular frames. This hasn't been needed in software ISP so far. But\nin order to be able to track metadata corresponding to a given frame,\nframe-request tracking mechanism starts being useful. This patch\nintroduces the basic tracking structure, actual metadata handling is\nadded in the following patch.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nTested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> # Lenovo X13s\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 72 ++++++++++++++++++++++--\n 1 file changed, 68 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 6e039bf3..004a8d53 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -181,6 +181,54 @@ LOG_DEFINE_CATEGORY(SimplePipeline)\n \n class SimplePipelineHandler;\n \n+struct SimpleFrameInfo {\n+\tSimpleFrameInfo(uint32_t f, Request *r)\n+\t\t: frame(f), request(r)\n+\t{\n+\t}\n+\n+\tuint32_t frame;\n+\tRequest *request;\n+};\n+\n+class SimpleFrames\n+{\n+public:\n+\tvoid create(Request *request);\n+\tvoid destroy(uint32_t frame);\n+\tvoid clear();\n+\n+\tSimpleFrameInfo *find(uint32_t frame);\n+\n+private:\n+\tstd::map<uint32_t, SimpleFrameInfo> frameInfo_;\n+};\n+\n+void SimpleFrames::create(Request *request)\n+{\n+\tconst uint32_t frame = request->sequence();\n+\tauto [it, inserted] = frameInfo_.try_emplace(frame, frame, request);\n+\tASSERT(inserted);\n+}\n+\n+void SimpleFrames::destroy(uint32_t frame)\n+{\n+\tframeInfo_.erase(frame);\n+}\n+\n+void SimpleFrames::clear()\n+{\n+\tframeInfo_.clear();\n+}\n+\n+SimpleFrameInfo *SimpleFrames::find(uint32_t frame)\n+{\n+\tauto info = frameInfo_.find(frame);\n+\tif (info == frameInfo_.end())\n+\t\treturn nullptr;\n+\treturn &info->second;\n+}\n+\n struct SimplePipelineInfo {\n \tconst char *driver;\n \t/*\n@@ -293,11 +341,13 @@ public:\n \n \tstd::unique_ptr<Converter> converter_;\n \tstd::unique_ptr<SoftwareIsp> swIsp_;\n+\tSimpleFrames frameInfo_;\n \n 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 conversionInputDone(FrameBuffer *buffer);\n \tvoid conversionOutputDone(FrameBuffer *buffer);\n \n@@ -785,7 +835,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\tpipe->completeRequest(request);\n+\t\t\tcompleteRequest(request);\n \t\t\treturn;\n \t\t}\n \n@@ -803,7 +853,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\tpipe->completeRequest(outputs.request);\n+\t\tcompleteRequest(outputs.request);\n \t\tconversionQueue_.pop();\n \n \t\treturn;\n@@ -861,7 +911,7 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \n \t/* Otherwise simply complete the request. */\n \tpipe->completeBuffer(request, buffer);\n-\tpipe->completeRequest(request);\n+\tcompleteRequest(request);\n }\n \n void SimpleCameraData::clearIncompleteRequests()\n@@ -872,6 +922,18 @@ void SimpleCameraData::clearIncompleteRequests()\n \t}\n }\n \n+void SimpleCameraData::completeRequest(Request *request)\n+{\n+\tSimpleFrameInfo *info = frameInfo_.find(request->sequence());\n+\tif (!info) {\n+\t\t/* Something is really wrong, let's return. */\n+\t\treturn;\n+\t}\n+\n+\tframeInfo_.destroy(info->frame);\n+\tpipe()->completeRequest(request);\n+}\n+\n void SimpleCameraData::conversionInputDone(FrameBuffer *buffer)\n {\n \t/* Queue the input buffer back for capture. */\n@@ -885,7 +947,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\tpipe->completeRequest(request);\n+\t\tcompleteRequest(request);\n }\n \n void SimpleCameraData::ispStatsReady(uint32_t frame, uint32_t bufferId)\n@@ -1398,6 +1460,7 @@ void SimplePipelineHandler::stopDevice(Camera *camera)\n \n \tvideo->bufferReady.disconnect(data, &SimpleCameraData::imageBufferReady);\n \n+\tdata->frameInfo_.clear();\n \tdata->clearIncompleteRequests();\n \tdata->conversionBuffers_.clear();\n \n@@ -1426,6 +1489,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t\t}\n \t}\n \n+\tdata->frameInfo_.create(request);\n \tif (data->useConversion_) {\n \t\tdata->conversionQueue_.push({ request, std::move(buffers) });\n \t\tif (data->swIsp_)\n", "prefixes": [ "v6", "1/6" ] }