{"id":22848,"url":"https://patchwork.libcamera.org/api/patches/22848/?format=json","web_url":"https://patchwork.libcamera.org/patch/22848/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250224185235.43381-3-mzamazal@redhat.com>","date":"2025-02-24T18:52:32","name":"[v2,2/5] libcamera: software_isp: Handle queued output buffers on stop","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"fd91ac83a479e1af25e51e7a19cd1198ea4b26f9","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22848/mbox/","series":[{"id":5016,"url":"https://patchwork.libcamera.org/api/series/5016/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5016","date":"2025-02-24T18:52:30","name":"Fix occasional software ISP assertion error on stop","version":2,"mbox":"https://patchwork.libcamera.org/series/5016/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22848/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22848/checks/","tags":{},"headers":{"Return-Path":"","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 574FFC32A9\n\tfor ;\n\tMon, 24 Feb 2025 18:52:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 088B3686FF;\n\tMon, 24 Feb 2025 19:52:57 +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 8AA2361856\n\tfor ;\n\tMon, 24 Feb 2025 19:52:54 +0100 (CET)","from mx-prod-mc-06.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-322-10SBzhVjOE69g0EmB76Qrg-1;\n\tMon, 24 Feb 2025 13:52:51 -0500","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id D668F180087C; Mon, 24 Feb 2025 18:52:49 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.225.60])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 199C21800352; Mon, 24 Feb 2025 18:52:47 +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=\"AVdW/hr2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1740423173;\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=29/66h17M1IjrZ7ZQh3Q/K4Eiv/s2bDJePsDYud9OVM=;\n\tb=AVdW/hr2BlX2fmBJbHFSa7BIXiiCxrzWzBatB2rghcOThdgCn38AHziQb3Yn4X8+iB50RC\n\ty0YMJwXn5fDkrWa2sosHLEUaer3ycNq2S1BYxl846OyZudutvjlAHDtrdOEdR2Wh75bdOf\n\tHjl2p8sN3BciN0xlmKZbv7iP3hBKxHA=","X-MC-Unique":"10SBzhVjOE69g0EmB76Qrg-1","X-Mimecast-MFC-AGG-ID":"10SBzhVjOE69g0EmB76Qrg_1740423170","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tStanislaw Gruszka ,\n\tLaurent Pinchart ,\n\tKieran Bingham ","Subject":"[PATCH v2 2/5] libcamera: software_isp: Handle queued output buffers\n\ton stop","Date":"Mon, 24 Feb 2025 19:52:32 +0100","Message-ID":"<20250224185235.43381-3-mzamazal@redhat.com>","In-Reply-To":"<20250224185235.43381-1-mzamazal@redhat.com>","References":"<20250224185235.43381-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"QJtRUNg4y1_V18j0MNCDAa1jVVVR25aD_M8C5102Ggo_1740423170","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 output buffers from the SoftwareIsp\nslots once SoftwareIsp is stopped. Let's track the queued output\nbuffers and mark those still pending as canceled in SoftwareIsp::stop\nand return them to the pipeline handler.\n\nDealing with input buffers is addressed in a separate patch.\n\nSigned-off-by: Milan Zamazal \n---\n .../internal/software_isp/software_isp.h | 1 +\n src/libcamera/software_isp/software_isp.cpp | 22 ++++++++++++++++---\n 2 files changed, 20 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex af0dcc24..f2344355 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -101,6 +101,7 @@ private:\n \n \tstd::unique_ptr ipa_;\n \tbool running_;\n+\tstd::deque queuedOutputBuffers_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 1a39f4d8..4339e547 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -17,6 +17,7 @@\n #include \n #include \n \n+#include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/software_isp/debayer_params.h\"\n \n@@ -300,8 +301,11 @@ int SoftwareIsp::queueBuffers(uint32_t frame, FrameBuffer *input,\n \t\t\treturn -EINVAL;\n \t}\n \n-\tfor (auto iter = outputs.begin(); iter != outputs.end(); iter++)\n-\t\tprocess(frame, input, iter->second);\n+\tfor (auto iter = outputs.begin(); iter != outputs.end(); iter++) {\n+\t\tFrameBuffer *const buffer = iter->second;\n+\t\tqueuedOutputBuffers_.push_back(buffer);\n+\t\tprocess(frame, input, buffer);\n+\t}\n \n \treturn 0;\n }\n@@ -331,6 +335,13 @@ void SoftwareIsp::stop()\n \n \trunning_ = false;\n \tipa_->stop();\n+\n+\tfor (auto buffer : queuedOutputBuffers_) {\n+\t\tFrameMetadata &metadata = buffer->_d()->metadata();\n+\t\tmetadata.status = FrameMetadata::FrameCancelled;\n+\t\toutputBufferReady.emit(buffer);\n+\t}\n+\tqueuedOutputBuffers_.clear();\n }\n \n /**\n@@ -369,7 +380,12 @@ void SoftwareIsp::inputReady(FrameBuffer *input)\n \n void SoftwareIsp::outputReady(FrameBuffer *output)\n {\n-\toutputBufferReady.emit(output);\n+\tif (running_) {\n+\t\tqueuedOutputBuffers_.erase(find(queuedOutputBuffers_.begin(),\n+\t\t\t\t\t\tqueuedOutputBuffers_.end(),\n+\t\t\t\t\t\toutput));\n+\t\toutputBufferReady.emit(output);\n+\t}\n }\n \n } /* namespace libcamera */\n","prefixes":["v2","2/5"]}