[libcamera-devel,v3,02/22] libcamera: pipeline: rkisp1: Remove redundant check of buffer in Request

Message ID 20200925014207.1455796-3-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: pipeline: rkisp1: Extend to support two streams
Related show

Commit Message

Niklas Söderlund Sept. 25, 2020, 1:41 a.m. UTC
There is no need to check if Request contains a buffer belonging the
RkISP1 Camera as this is already done in Camera::queueRequest(), remove
the redundant check.

Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 -----
 1 file changed, 5 deletions(-)

Comments

Jacopo Mondi Sept. 25, 2020, 8:54 a.m. UTC | #1
Hi Niklas,

On Fri, Sep 25, 2020 at 03:41:47AM +0200, Niklas Söderlund wrote:
> There is no need to check if Request contains a buffer belonging the
> RkISP1 Camera as this is already done in Camera::queueRequest(), remove
> the redundant check.
>

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks

> Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index 009d190d3ec828f0..77a48106ec68cb7b 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -243,11 +243,6 @@ RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stre
>  	FrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();
>
>  	FrameBuffer *videoBuffer = request->findBuffer(stream);
> -	if (!videoBuffer) {
> -		LOG(RkISP1, Error)
> -			<< "Attempt to queue request with invalid stream";
> -		return nullptr;
> -	}
>
>  	pipe_->availableParamBuffers_.pop();
>  	pipe_->availableStatBuffers_.pop();
> --
> 2.28.0
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 009d190d3ec828f0..77a48106ec68cb7b 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -243,11 +243,6 @@  RkISP1FrameInfo *RkISP1Frames::create(unsigned int frame, Request *request, Stre
 	FrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();
 
 	FrameBuffer *videoBuffer = request->findBuffer(stream);
-	if (!videoBuffer) {
-		LOG(RkISP1, Error)
-			<< "Attempt to queue request with invalid stream";
-		return nullptr;
-	}
 
 	pipe_->availableParamBuffers_.pop();
 	pipe_->availableStatBuffers_.pop();