[v2] test: camera: Use Request::ReuseBuffers flag

24069 diff mbox series

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 <uajain@igalia.com>
---
changes in v2:
- Drop invalid "Create a new request" comments
---
 test/camera/buffer_import.cpp      | 9 +--------
 test/camera/camera_reconfigure.cpp | 8 +-------
 test/camera/capture.cpp            | 9 +--------
 3 files changed, 3 insertions(+), 23 deletions(-)

Quoting Umang Jain (2025-08-07 14:57:26)
> 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 <uajain@igalia.com>
> ---
> changes in v2:
> - Drop invalid "Create a new request" comments
> ---
>  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. */

Might be worth putting that comment with the other cases too to match.
But it doesn't matter.


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> -               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();
> -- 
> 2.50.0
>