Patch Detail
Show a patch.
GET /api/1.1/patches/22843/?format=api
{ "id": 22843, "url": "https://patchwork.libcamera.org/api/1.1/patches/22843/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22843/", "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": "<20250224120854.19747-4-mzamazal@redhat.com>", "date": "2025-02-24T12:08:52", "name": "[3/5] libcamera: software_isp: Handle queued input buffers on stop", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1eee451010d38119c4014b35cde61735b269aa2a", "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/22843/mbox/", "series": [ { "id": 5015, "url": "https://patchwork.libcamera.org/api/1.1/series/5015/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5015", "date": "2025-02-24T12:08:49", "name": "Fix occasional software ISP assertion error on stop", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5015/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22843/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22843/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 B8D47C324E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 24 Feb 2025 12:09:20 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6C104686F0;\n\tMon, 24 Feb 2025 13:09:20 +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 CD2B4686ED\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 24 Feb 2025 13:09:17 +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-316-tTYMY2GoPHW9K5vYuCNqLQ-1;\n\tMon, 24 Feb 2025 07:09:13 -0500", "from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\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 5E56E1801A13; Mon, 24 Feb 2025 12:09:12 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.225.60])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 53E1119560AA; Mon, 24 Feb 2025 12:09:10 +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=\"gvGJitKe\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1740398956;\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=a2/uxq3M7+7hr2SML4vsDQcWpZ0TRLIggA7kU6LG8zE=;\n\tb=gvGJitKeBmeKC+wi8c6lWFOLwbnl/fBaj4rlaiMThrbuLY4WZEHh+E+CQrqkbLZoc+USvs\n\tjMnuoYF43Xubj74Xs1XMfRzhp5BBiYqZDPfqGcTs8OeCiX0nIQVHXXhOQ6Ake/QYdPcvH5\n\tOVAtq7RtLVDFuQDdi5vR4fgqCWkJvRI=", "X-MC-Unique": "tTYMY2GoPHW9K5vYuCNqLQ-1", "X-Mimecast-MFC-AGG-ID": "tTYMY2GoPHW9K5vYuCNqLQ_1740398952", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH 3/5] libcamera: software_isp: Handle queued input buffers on\n\tstop", "Date": "Mon, 24 Feb 2025 13:08:52 +0100", "Message-ID": "<20250224120854.19747-4-mzamazal@redhat.com>", "In-Reply-To": "<20250224120854.19747-1-mzamazal@redhat.com>", "References": "<20250224120854.19747-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.40", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "ZMgBRry2Pw61GMcox-rVcVrFWKWeYKVPGuLJNtawj6k_1740398952", "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": "When SoftwareIsp stops, input and output buffers queued to it may not\nyet be fully processed. They will be eventually returned but stop means\nstop, there should be no processing related actions invoked afterwards.\n\nLet's stop forwarding processed input buffers from SoftwareIsp slots\nwhen SoftwareIsp is stopped. Let's track the queued input buffers and\nreturn them back for capture in SoftwareIsp::stop().\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../internal/software_isp/software_isp.h | 1 +\n src/libcamera/software_isp/software_isp.cpp | 16 +++++++++++++++-\n 2 files changed, 16 insertions(+), 1 deletion(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex f2344355..bfe34725 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -102,6 +102,7 @@ private:\n \tstd::unique_ptr<ipa::soft::IPAProxySoft> ipa_;\n \tbool running_;\n \tstd::deque<FrameBuffer *> queuedOutputBuffers_;\n+\tstd::deque<FrameBuffer *> queuedInputBuffers_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 4339e547..3a605ab2 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -301,6 +301,8 @@ int SoftwareIsp::queueBuffers(uint32_t frame, FrameBuffer *input,\n \t\t\treturn -EINVAL;\n \t}\n \n+\tqueuedInputBuffers_.push_back(input);\n+\n \tfor (auto iter = outputs.begin(); iter != outputs.end(); iter++) {\n \t\tFrameBuffer *const buffer = iter->second;\n \t\tqueuedOutputBuffers_.push_back(buffer);\n@@ -327,6 +329,9 @@ int SoftwareIsp::start()\n \n /**\n * \\brief Stops the Software ISP streaming operation\n+ *\n+ * All pending buffers are returned back (output buffers as canceled) before\n+ * this method finishes.\n */\n void SoftwareIsp::stop()\n {\n@@ -342,6 +347,10 @@ void SoftwareIsp::stop()\n \t\toutputBufferReady.emit(buffer);\n \t}\n \tqueuedOutputBuffers_.clear();\n+\n+\tfor (auto buffer : queuedInputBuffers_)\n+\t\tinputBufferReady.emit(buffer);\n+\tqueuedInputBuffers_.clear();\n }\n \n /**\n@@ -375,7 +384,12 @@ void SoftwareIsp::statsReady(uint32_t frame, uint32_t bufferId)\n \n void SoftwareIsp::inputReady(FrameBuffer *input)\n {\n-\tinputBufferReady.emit(input);\n+\tif (running_) {\n+\t\tqueuedInputBuffers_.erase(find(queuedInputBuffers_.begin(),\n+\t\t\t\t\t queuedInputBuffers_.end(),\n+\t\t\t\t\t input));\n+\t\tinputBufferReady.emit(input);\n+\t}\n }\n \n void SoftwareIsp::outputReady(FrameBuffer *output)\n", "prefixes": [ "3/5" ] }