[v4,2/4] libcamera: software_isp: Drop unnecessary sanity check
diff mbox series

Message ID 20240624134859.171969-3-umang.jain@ideasonboard.com
State Accepted
Headers show
Series
  • libcamera: converter: Replace usage of stream index by Stream pointer
Related show

Commit Message

Umang Jain June 24, 2024, 1:48 p.m. UTC 
Currently the soft-isp outputs a single output stream. Hence,
drop the unnecessary check for stream indexes.

Another reason to drop is actually the stream indexes is meant to be
unique in outputs std::map<>, hence checking for unique stream indexes
is redundant.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/libcamera/software_isp/software_isp.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Paul Elder July 2, 2024, 10:57 a.m. UTC | #1 
On Mon, Jun 24, 2024 at 07:18:57PM +0530, Umang Jain wrote:
> Currently the soft-isp outputs a single output stream. Hence,
> drop the unnecessary check for stream indexes.
> 
> Another reason to drop is actually the stream indexes is meant to be
> unique in outputs std::map<>, hence checking for unique stream indexes
> is redundant.
> 
> Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  src/libcamera/software_isp/software_isp.cpp | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
> index 20fb6f48..3fb7ec8c 100644
> --- a/src/libcamera/software_isp/software_isp.cpp
> +++ b/src/libcamera/software_isp/software_isp.cpp
> @@ -287,12 +287,9 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,
>  int SoftwareIsp::queueBuffers(FrameBuffer *input,
>  			      const std::map<unsigned int, FrameBuffer *> &outputs)
>  {
> -	unsigned int mask = 0;
> -
>  	/*
>  	 * Validate the outputs as a sanity check: at least one output is
> -	 * required, all outputs must reference a valid stream and no two
> -	 * outputs can reference the same stream.
> +	 * required, all outputs must reference a valid stream.
>  	 */
>  	if (outputs.empty())
>  		return -EINVAL;
> @@ -302,10 +299,6 @@ int SoftwareIsp::queueBuffers(FrameBuffer *input,
>  			return -EINVAL;
>  		if (index >= 1) /* only single stream atm */
>  			return -EINVAL;
> -		if (mask & (1 << index))
> -			return -EINVAL;
> -
> -		mask |= 1 << index;
>  	}
>  
>  	process(input, outputs.at(0));
> -- 
> 2.44.0
>

Patch
diff mbox series 

diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
index 20fb6f48..3fb7ec8c 100644
--- a/src/libcamera/software_isp/software_isp.cpp
+++ b/src/libcamera/software_isp/software_isp.cpp
@@ -287,12 +287,9 @@  int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,
 int SoftwareIsp::queueBuffers(FrameBuffer *input,
 			      const std::map<unsigned int, FrameBuffer *> &outputs)
 {
-	unsigned int mask = 0;
-
 	/*
 	 * Validate the outputs as a sanity check: at least one output is
-	 * required, all outputs must reference a valid stream and no two
-	 * outputs can reference the same stream.
+	 * required, all outputs must reference a valid stream.
 	 */
 	if (outputs.empty())
 		return -EINVAL;
@@ -302,10 +299,6 @@  int SoftwareIsp::queueBuffers(FrameBuffer *input,
 			return -EINVAL;
 		if (index >= 1) /* only single stream atm */
 			return -EINVAL;
-		if (mask & (1 << index))
-			return -EINVAL;
-
-		mask |= 1 << index;
 	}
 
 	process(input, outputs.at(0));