Patch Detail
Show a patch.
GET /api/patches/27116/?format=api
{ "id": 27116, "url": "https://patchwork.libcamera.org/api/patches/27116/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27116/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20260629163017.863145-38-barnabas.pocze@ideasonboard.com>", "date": "2026-06-29T16:30:00", "name": "[RFC,v1,37/54] libcamera: camera: bufferCompleted: Pass `Stream` as well", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8fef7d876d1974dae65f12efd40e1007b755b750", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27116/mbox/", "series": [ { "id": 6025, "url": "https://patchwork.libcamera.org/api/series/6025/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6025", "date": "2026-06-29T16:29:23", "name": "libcamera: Split requests and buffers", "version": 1, "mbox": "https://patchwork.libcamera.org/series/6025/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/27116/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27116/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 160A5C3261\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Jun 2026 16:31:29 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8E11165FAC;\n\tMon, 29 Jun 2026 18:31:28 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 39FD365F5A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Jun 2026 18:30:29 +0200 (CEST)", "from pb-laptop.local (185.221.140.128.nat.pool.zt.hu\n\t[185.221.140.128])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 14C5FE91\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Jun 2026 18:29:46 +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=\"f9Prlu1Y\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1782750586;\n\tbh=t85wYxmHMVG+Juya15nQvnb0oywUplTp+vdfjueU+z8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=f9Prlu1YwIRKl2CTvEGHzhyUPxh7bgMCUXo/f73jl4GNT/sm3BPSulkuuBdngWA1S\n\t8sR8S+M0yjHRXimGThudkLoGkA3NJE6iA92ZsoQky9la1IRvvBwfQvknJe5QegULm9\n\tTqUIrWPGHtpMTe92BdhPgEPpkJX6d0PrLVeFZEYw=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[RFC PATCH v1 37/54] libcamera: camera: bufferCompleted: Pass\n\t`Stream` as well", "Date": "Mon, 29 Jun 2026 18:30:00 +0200", "Message-ID": "<20260629163017.863145-38-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.54.0", "In-Reply-To": "<20260629163017.863145-1-barnabas.pocze@ideasonboard.com>", "References": "<20260629163017.863145-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": "<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": "Provide information about which stream the just completed buffer belongs to.\nThis makes it easier for applications to know how to process the request,\nsince they do not need to have a buffer -> stream mapping or a series of\n`request->findBuffer(stream) == buffer` conditions.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n include/libcamera/camera.h | 2 +-\n src/libcamera/camera.cpp | 10 ++++++----\n src/libcamera/pipeline_handler.cpp | 8 ++++----\n src/libcamera/request.cpp | 5 +++--\n test/camera/buffer_import.cpp | 1 +\n test/camera/capture.cpp | 1 +\n 6 files changed, 16 insertions(+), 11 deletions(-)", "diff": "diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\nindex 471975a890..0195a9f3a8 100644\n--- a/include/libcamera/camera.h\n+++ b/include/libcamera/camera.h\n@@ -124,7 +124,7 @@ public:\n \n \tconst std::string &id() const;\n \n-\tSignal<Request *, FrameBuffer *> bufferCompleted;\n+\tSignal<Request *, const Stream *, FrameBuffer *> bufferCompleted;\n \tSignal<Request *> requestCompleted;\n \tSignal<> disconnected;\n \ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex be55ed72c4..1bb696566c 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -800,12 +800,14 @@ Camera::Private::acquireBuffer(const Stream *stream)\n */\n void Camera::Private::rejectBuffer(FrameBuffer *buffer)\n {\n+\tconst Stream *stream = buffer->_d()->stream_;\n+\n \tASSERT(!buffer->_d()->request());\n-\tASSERT(buffer->_d()->stream_);\n+\tASSERT(stream);\n \n \tLOG(Camera, Debug)\n \t\t<< \"Camera:\" << LIBCAMERA_O_PTR() << \" rejects buffer:\"\n-\t\t<< buffer << \" for stream:\" << buffer->_d()->stream_;\n+\t\t<< buffer << \" for stream:\" << stream;\n \n \t/*\n \t * \\todo Not `FrameError` because that requires `timestamp` and\n@@ -814,8 +816,8 @@ void Camera::Private::rejectBuffer(FrameBuffer *buffer)\n \tbuffer->_d()->cancel();\n \tbuffer->_d()->stream_ = nullptr;\n \n-\t// \\todo separate event (with stream) ?\n-\tLIBCAMERA_O_PTR()->bufferCompleted.emit(nullptr, buffer);\n+\t// \\todo separate event?\n+\tLIBCAMERA_O_PTR()->bufferCompleted.emit(nullptr, stream, buffer);\n }\n \n /**\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 755c78b308..27ce25ad11 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -421,20 +421,20 @@ void PipelineHandler::stop(Camera *camera)\n \t\tdoQueueRequest(request);\n \t}\n \n-\tconst auto returnBuffer = [&](FrameBuffer *buffer) {\n+\tconst auto returnBuffer = [&](const Stream *stream, FrameBuffer *buffer) {\n \t\tASSERT(!buffer->_d()->stream_);\n \t\tbuffer->_d()->cancel();\n-\t\tcamera->bufferCompleted.emit(nullptr, buffer);\n+\t\tcamera->bufferCompleted.emit(nullptr, stream, buffer);\n \t};\n \n \tfor (auto &pf : data->pendingFences_)\n-\t\treturnBuffer(pf.buffer);\n+\t\treturnBuffer(pf.stream, pf.buffer);\n \n \tdata->pendingFences_.clear();\n \n \tfor (auto &[stream, streamData] : data->streamData_) {\n \t\tfor (FrameBuffer *buffer : streamData.buffers)\n-\t\t\treturnBuffer(buffer);\n+\t\t\treturnBuffer(stream, buffer);\n \n \t\tstreamData.buffers.clear();\n \t}\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex ecdf558066..4fb8c0a659 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -108,7 +108,8 @@ bool Request::Private::completeBuffer(FrameBuffer *buffer)\n \tLIBCAMERA_TRACEPOINT(request_complete_buffer, this, buffer);\n \n \tRequest *request = LIBCAMERA_O_PTR();\n-\tauto it = request->bufferMap_.find(buffer->_d()->stream_);\n+\tconst Stream *stream = buffer->_d()->stream_;\n+\tauto it = request->bufferMap_.find(stream);\n \tASSERT(it != request->bufferMap_.end());\n \tASSERT(it->second == buffer || !it->second);\n \n@@ -122,7 +123,7 @@ bool Request::Private::completeBuffer(FrameBuffer *buffer)\n \tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n \t\tcancelled_ = true;\n \n-\tcamera_->bufferCompleted.emit(request, buffer);\n+\tcamera_->bufferCompleted.emit(request, stream, buffer);\n \n \treturn !hasPendingBuffers();\n }\ndiff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex 5e271ad3d0..c6f35a3135 100644\n--- a/test/camera/buffer_import.cpp\n+++ b/test/camera/buffer_import.cpp\n@@ -39,6 +39,7 @@ public:\n \n protected:\n \tvoid bufferComplete([[maybe_unused]] Request *request,\n+\t\t\t [[maybe_unused]] const Stream *stream,\n \t\t\t FrameBuffer *buffer)\n \t{\n \t\tif (buffer->metadata().status != FrameMetadata::FrameSuccess)\ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex fabe297e53..bc8cf4c59d 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -35,6 +35,7 @@ protected:\n \tunsigned int completeRequestsCount_;\n \n \tvoid bufferComplete([[maybe_unused]] Request *request,\n+\t\t\t [[maybe_unused]] const Stream *stream,\n \t\t\t FrameBuffer *buffer)\n \t{\n \t\tif (buffer->metadata().status != FrameMetadata::FrameSuccess)\n", "prefixes": [ "RFC", "v1", "37/54" ] }