{"id":27122,"url":"https://patchwork.libcamera.org/api/patches/27122/?format=json","web_url":"https://patchwork.libcamera.org/patch/27122/","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":"<20260629163017.863145-44-barnabas.pocze@ideasonboard.com>","date":"2026-06-29T16:30:06","name":"[RFC,v1,43/54] test: Use camera buffer pool","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"722d82e8142fa40dc7608f81bef12b1ef7158af0","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27122/mbox/","series":[{"id":6025,"url":"https://patchwork.libcamera.org/api/series/6025/?format=json","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/27122/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27122/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 D6273C3303\n\tfor ;\n\tMon, 29 Jun 2026 16:31:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7FB1465FC1;\n\tMon, 29 Jun 2026 18:31:35 +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 BEA5065F68\n\tfor ;\n\tMon, 29 Jun 2026 18:30:30 +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 96621E91\n\tfor ;\n\tMon, 29 Jun 2026 18:29:47 +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=\"lsnPwV1Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1782750587;\n\tbh=hLyydRT7gnfRwyUIKcRyO2xfLAfGw2wn7YD6yupxNQo=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=lsnPwV1QjOrCmTsb3zFHMTjweiHdUz81VZLu9sc+Wh+RUY01mPK8ih/Y3JYfehpsV\n\t0TG6pWSkAHCQxkTev2jEDWtEPcLnqQeNRVRJYOwBjUlIumXXgJt3oAVfBV56FQwSLp\n\t0+5ro+bl0a0xQUOZ9iWD4XBgxFdYNXOlyrSrMJS0=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[RFC PATCH v1 43/54] test: Use camera buffer pool","Date":"Mon, 29 Jun 2026 18:30:06 +0200","Message-ID":"<20260629163017.863145-44-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":"","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":"Port to using the camera's buffer pool.\n\nReviewed-by: Barnabás Pőcze \n---\n test/camera/buffer_import.cpp | 21 +++++++++++++++------\n test/camera/camera_reconfigure.cpp | 22 +++++++++++++++-------\n test/camera/capture.cpp | 23 ++++++++++++++++-------\n test/camera/statemachine.cpp | 4 +++-\n 4 files changed, 49 insertions(+), 21 deletions(-)","diff":"diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex c6f35a3135..0fd1749acc 100644\n--- a/test/camera/buffer_import.cpp\n+++ b/test/camera/buffer_import.cpp\n@@ -55,7 +55,12 @@ protected:\n \n \t\tcompleteRequestsCount_++;\n \n-\t\trequest->reuse(Request::ReuseBuffers);\n+\t\tfor (const auto &[stream, buffer] : request->buffers())\n+\t\t\tcamera_->addBuffer(stream, buffer);\n+\n+\t\trequest->reuse();\n+\t\trequest->enableStream(config_->at(0).stream(), true);\n+\n \t\tcamera_->queueRequest(request);\n \n \t\tdispatcher_->interrupt();\n@@ -98,17 +103,14 @@ protected:\n \t\tif (ret != TestPass)\n \t\t\treturn ret;\n \n-\t\tfor (const std::unique_ptr &buffer : source.buffers()) {\n+\t\tfor ([[maybe_unused]] const auto &buffer : source.buffers()) {\n \t\t\tstd::unique_ptr request = camera_->createRequest();\n \t\t\tif (!request) {\n \t\t\t\tstd::cout << \"Failed to create request\" << std::endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\n \n-\t\t\tif (request->addBuffer(stream, buffer.get())) {\n-\t\t\t\tstd::cout << \"Failed to associating buffer with request\" << std::endl;\n-\t\t\t\treturn TestFail;\n-\t\t\t}\n+\t\t\trequest->enableStream(stream, true);\n \n \t\t\trequests_.push_back(std::move(request));\n \t\t}\n@@ -124,6 +126,13 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tfor (const std::unique_ptr &buffer : source.buffers()) {\n+\t\t\tif (camera_->addBuffer(stream, buffer.get())) {\n+\t\t\t\tstd::cout << \"Failed to add buffer\" << std::endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n \t\tfor (std::unique_ptr &request : requests_) {\n \t\t\tif (camera_->queueRequest(request.get())) {\n \t\t\t\tstd::cout << \"Failed to queue request\" << std::endl;\ndiff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp\nindex ae9941c16b..0688a24582 100644\n--- a/test/camera/camera_reconfigure.cpp\n+++ b/test/camera/camera_reconfigure.cpp\n@@ -46,8 +46,12 @@ private:\n \t\tif (request->status() != Request::RequestComplete)\n \t\t\treturn;\n \n-\t\t/* Reuse the request and re-queue it with the same buffers. */\n-\t\trequest->reuse(Request::ReuseBuffers);\n+\t\tfor (const auto &[stream, buffer] : request->buffers())\n+\t\t\tcamera_->addBuffer(stream, buffer);\n+\n+\t\trequest->reuse();\n+\t\trequest->enableStream(config_->at(0).stream(), true);\n+\n \t\tcamera_->queueRequest(request);\n \t}\n \n@@ -80,17 +84,14 @@ private:\n \t\t\tallocated_ = true;\n \t\t}\n \n-\t\tfor (const unique_ptr &buffer : allocator_->buffers(stream)) {\n+\t\tfor ([[maybe_unused]] const auto &buffer : allocator_->buffers(stream)) {\n \t\t\tunique_ptr request = camera_->createRequest();\n \t\t\tif (!request) {\n \t\t\t\tcerr << \"Failed to create request\" << endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\n \n-\t\t\tif (request->addBuffer(stream, buffer.get())) {\n-\t\t\t\tcerr << \"Failed to associate buffer with request\" << endl;\n-\t\t\t\treturn TestFail;\n-\t\t\t}\n+\t\t\trequest->enableStream(stream, true);\n \n \t\t\trequests_.push_back(std::move(request));\n \t\t}\n@@ -102,6 +103,13 @@ private:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tfor (const unique_ptr &buffer : allocator_->buffers(stream)) {\n+\t\t\tif (camera_->addBuffer(stream, buffer.get())) {\n+\t\t\t\tcerr << \"Failed to add buffer\" << endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n \t\tfor (unique_ptr &request : requests_) {\n \t\t\tif (camera_->queueRequest(request.get())) {\n \t\t\t\tcerr << \"Failed to queue request\" << endl;\ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex bc8cf4c59d..35ceabf87a 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -51,7 +51,12 @@ protected:\n \n \t\tcompleteRequestsCount_++;\n \n-\t\trequest->reuse(Request::ReuseBuffers);\n+\t\tfor (const auto &[stream, buffer] : request->buffers())\n+\t\t\tcamera_->addBuffer(stream, buffer);\n+\n+\t\trequest->reuse();\n+\t\trequest->enableStream(config_->at(0).stream(), true);\n+\n \t\tcamera_->queueRequest(request);\n \n \t\tdispatcher_->interrupt();\n@@ -99,17 +104,14 @@ protected:\n \t\tif (ret < 0)\n \t\t\treturn TestFail;\n \n-\t\tfor (const std::unique_ptr &buffer : allocator_->buffers(stream)) {\n-\t\t\tstd::unique_ptr request = camera_->createRequest();\n+\t\tfor ([[maybe_unused]] const auto &buffer : allocator_->buffers(stream)) {\n+\t\t\tunique_ptr request = camera_->createRequest();\n \t\t\tif (!request) {\n \t\t\t\tcout << \"Failed to create request\" << endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\n \n-\t\t\tif (request->addBuffer(stream, buffer.get())) {\n-\t\t\t\tcout << \"Failed to associate buffer with request\" << endl;\n-\t\t\t\treturn TestFail;\n-\t\t\t}\n+\t\t\trequest->enableStream(stream, true);\n \n \t\t\trequests_.push_back(std::move(request));\n \t\t}\n@@ -125,6 +127,13 @@ protected:\n \t\t\treturn TestFail;\n \t\t}\n \n+\t\tfor (const unique_ptr &buffer : allocator_->buffers(stream)) {\n+\t\t\tif (camera_->addBuffer(stream, buffer.get())) {\n+\t\t\t\tcout << \"Failed to add buffer\" << endl;\n+\t\t\t\treturn TestFail;\n+\t\t\t}\n+\t\t}\n+\n \t\tfor (std::unique_ptr &request : requests_) {\n \t\t\tif (camera_->queueRequest(request.get())) {\n \t\t\t\tcout << \"Failed to queue request\" << endl;\ndiff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp\nindex 9c2b0c6a7d..97bd5344cd 100644\n--- a/test/camera/statemachine.cpp\n+++ b/test/camera/statemachine.cpp\n@@ -150,9 +150,11 @@ protected:\n \t\t\treturn TestFail;\n \n \t\tStream *stream = *camera_->streams().begin();\n-\t\tif (request->addBuffer(stream, allocator_->buffers(stream)[0].get()))\n+\t\tif (camera_->addBuffer(stream, allocator_->buffers(stream)[0].get()))\n \t\t\treturn TestFail;\n \n+\t\trequest->enableStream(stream, true);\n+\n \t\tif (camera_->queueRequest(request.get()))\n \t\t\treturn TestFail;\n \n","prefixes":["RFC","v1","43/54"]}