From 17ae86986e0949400d965ee18b80efa97ed3eb56 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Thu, 7 Aug 2025 19:27:26 +0530 Subject: [PATCH] test: camera: Use Request::ReuseBuffers flag Pass Request::ReuseBuffers flag to request->reuse() where the same buffers are added to the request, as the flag exists precisely for such use cases. This commit also drops invalid comments about creating new requests, since requests were already being reused for `buffer_import` and `capture` tests since commit c753223ad6b9 ("libcamera, android, cam, gstreamer, qcam, v4l2: Reuse Request"). Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder Signed-off-by: Kieran Bingham --- test/camera/buffer_import.cpp | 9 +-------- test/camera/camera_reconfigure.cpp | 8 +------- test/camera/capture.cpp | 9 +-------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 815d1cae..5e271ad3 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -52,16 +52,9 @@ protected: if (request->status() != Request::RequestComplete) return; - const Request::BufferMap &buffers = request->buffers(); - completeRequestsCount_++; - /* Create a new request. */ - const Stream *stream = buffers.begin()->first; - FrameBuffer *buffer = buffers.begin()->second; - - request->reuse(); - request->addBuffer(stream, buffer); + request->reuse(Request::ReuseBuffers); camera_->queueRequest(request); dispatcher_->interrupt(); diff --git a/test/camera/camera_reconfigure.cpp b/test/camera/camera_reconfigure.cpp index 06c87730..ae9941c1 100644 --- a/test/camera/camera_reconfigure.cpp +++ b/test/camera/camera_reconfigure.cpp @@ -46,14 +46,8 @@ private: if (request->status() != Request::RequestComplete) return; - const Request::BufferMap &buffers = request->buffers(); - - const Stream *stream = buffers.begin()->first; - FrameBuffer *buffer = buffers.begin()->second; - /* Reuse the request and re-queue it with the same buffers. */ - request->reuse(); - request->addBuffer(stream, buffer); + request->reuse(Request::ReuseBuffers); camera_->queueRequest(request); } diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index 8766fb19..fabe297e 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -48,16 +48,9 @@ protected: if (request->status() != Request::RequestComplete) return; - const Request::BufferMap &buffers = request->buffers(); - completeRequestsCount_++; - /* Create a new request. */ - const Stream *stream = buffers.begin()->first; - FrameBuffer *buffer = buffers.begin()->second; - - request->reuse(); - request->addBuffer(stream, buffer); + request->reuse(Request::ReuseBuffers); camera_->queueRequest(request); dispatcher_->interrupt();