{"id":26970,"url":"https://patchwork.libcamera.org/api/1.1/patches/26970/?format=json","web_url":"https://patchwork.libcamera.org/patch/26970/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20260618123844.656396-7-barnabas.pocze@ideasonboard.com>","date":"2026-06-18T12:38:23","name":"[RFC,v1,06/27] libcamera: pipeline: Replace open-coded buffer cancellation","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d59a9531c23fac5905dd0c0682a178a987a47d67","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/1.1/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26970/mbox/","series":[{"id":6006,"url":"https://patchwork.libcamera.org/api/1.1/series/6006/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6006","date":"2026-06-18T12:38:17","name":"Misc. changes before request-buffer split","version":1,"mbox":"https://patchwork.libcamera.org/series/6006/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26970/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26970/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 731B9BF415\n\tfor ;\n\tThu, 18 Jun 2026 12:39:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4A74F656F3;\n\tThu, 18 Jun 2026 14:38:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A8F9262988\n\tfor ;\n\tThu, 18 Jun 2026 14:38:49 +0200 (CEST)","from pb-laptop.local (185.182.214.63.nat.pool.zt.hu\n\t[185.182.214.63])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C02BBDF3\n\tfor ;\n\tThu, 18 Jun 2026 14:38:14 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LfjgGEkx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1781786294;\n\tbh=O3We75ZOHawp7iJV9ga2dmQR4w67y7tlCrcU0AUq7fY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=LfjgGEkx85p+fIVU6kk6F//gtlBoJHhg+TG4/hfna+4y+1Sm2C9BEozSf6lHC3vVL\n\txyvFEq+4+RQQpB547vi0rYbhADpLH4sA9DQ2Td69JIkSP9c9AlOpD+JZ4x5zEwTGKP\n\tiTPiAinXe8E5c28AA/7ofytOQbK/A9uj9LVB4Sn8=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[RFC PATCH v1 06/27] libcamera: pipeline: Replace open-coded buffer\n\tcancellation","Date":"Thu, 18 Jun 2026 14:38:23 +0200","Message-ID":"<20260618123844.656396-7-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260618123844.656396-1-barnabas.pocze@ideasonboard.com>","References":"<20260618123844.656396-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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":"Use `PipelineHander::cancelRequest()` instead of manually cancelling, completing\neach buffer, then completing the request. This has the same behaviour unless\nthe request has no pending buffers.\n\nSigned-off-by: Barnabás Pőcze \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 14 ++------------\n .../pipeline/rpi/common/pipeline_base.cpp | 16 +---------------\n src/libcamera/pipeline/vimc/vimc.cpp | 7 +------\n 3 files changed, 4 insertions(+), 33 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex bf4c2921f2..560fccd8c0 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -790,12 +790,7 @@ void IPU3CameraData::cancelPendingRequests()\n \twhile (!pendingRequests_.empty()) {\n \t\tRequest *request = pendingRequests_.front();\n \n-\t\tfor (const auto &[stream, buffer] : request->buffers()) {\n-\t\t\tbuffer->_d()->cancel();\n-\t\t\tpipe()->completeBuffer(request, buffer);\n-\t\t}\n-\n-\t\tpipe()->completeRequest(request);\n+\t\tpipe()->cancelRequest(request);\n \t\tpendingRequests_.pop();\n \t}\n }\n@@ -1299,13 +1294,8 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \n \t/* If the buffer is cancelled force a complete of the whole request. */\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n-\t\tfor (const auto &[stream, b] : request->buffers()) {\n-\t\t\tb->_d()->cancel();\n-\t\t\tpipe()->completeBuffer(request, b);\n-\t\t}\n-\n \t\tframeInfos_.remove(info);\n-\t\tpipe()->completeRequest(request);\n+\t\tpipe()->cancelRequest(request);\n \t\treturn;\n \t}\n \ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 5a5acf6a16..6a6be5c820 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1401,21 +1401,7 @@ void CameraData::clearIncompleteRequests()\n \t * back to the application.\n \t */\n \twhile (!requestQueue_.empty()) {\n-\t\tRequest *request = requestQueue_.front();\n-\n-\t\tfor (auto &b : request->buffers()) {\n-\t\t\tFrameBuffer *buffer = b.second;\n-\t\t\t/*\n-\t\t\t * Has the buffer already been handed back to the\n-\t\t\t * request? If not, do so now.\n-\t\t\t */\n-\t\t\tif (buffer->request()) {\n-\t\t\t\tbuffer->_d()->cancel();\n-\t\t\t\tpipe()->completeBuffer(request, buffer);\n-\t\t\t}\n-\t\t}\n-\n-\t\tpipe()->completeRequest(request);\n+\t\tpipe()->cancelRequest(requestQueue_.front());\n \t\trequestQueue_.pop();\n \t}\n }\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 6681c74ee5..3d010d80e5 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -605,12 +605,7 @@ void VimcCameraData::imageBufferReady(FrameBuffer *buffer)\n \n \t/* If the buffer is cancelled force a complete of the whole request. */\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled) {\n-\t\tfor (const auto &[stream, b] : request->buffers()) {\n-\t\t\tb->_d()->cancel();\n-\t\t\tpipe->completeBuffer(request, b);\n-\t\t}\n-\n-\t\tpipe->completeRequest(request);\n+\t\tpipe->cancelRequest(request);\n \t\treturn;\n \t}\n \n","prefixes":["RFC","v1","06/27"]}