[libcamera-devel,2/3] libcamera: ipu3: Remove dead code check

Message ID 20200924145143.117733-3-jacopo@jmondi.org
State Accepted
Headers show
Series
  • libcamera: ipu3: Fix RAW+YUV capture
Related show

Commit Message

Jacopo Mondi Sept. 24, 2020, 2:51 p.m. UTC
Since the re-implementation of the IPU3 pipeline handler
configuration procedure, the main output is always assigned in
case any YUV stream is requested.

Remove a dead code block that checks for the main output to be
valid.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/pipeline/ipu3/ipu3.cpp | 6 ------
 1 file changed, 6 deletions(-)

Comments

Laurent Pinchart Sept. 28, 2020, 11:21 p.m. UTC | #1
Hi Jacopo,

Thank you for the patch.

On Thu, Sep 24, 2020 at 04:51:42PM +0200, Jacopo Mondi wrote:
> Since the re-implementation of the IPU3 pipeline handler
> configuration procedure, the main output is always assigned in
> case any YUV stream is requested.
> 
> Remove a dead code block that checks for the main output to be
> valid.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 9cea6c7e9611..477f85a45755 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -501,12 +501,6 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
>  	 * the configuration of the active one for that purpose (there should
>  	 * be at least one active stream in the configuration request).
>  	 */
> -	if (!mainCfg) {
> -		ret = imgu->configureOutput(*vfCfg, &outputFormat);
> -		if (ret)
> -			return ret;
> -	}
> -
>  	if (!vfCfg) {
>  		ret = imgu->configureViewfinder(*mainCfg, &outputFormat);
>  		if (ret)
Niklas Söderlund Sept. 29, 2020, 5:35 a.m. UTC | #2
Hi Jacopo,

Thanks for your patch.

On 2020-09-24 16:51:42 +0200, Jacopo Mondi wrote:
> Since the re-implementation of the IPU3 pipeline handler
> configuration procedure, the main output is always assigned in
> case any YUV stream is requested.
> 
> Remove a dead code block that checks for the main output to be
> valid.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 9cea6c7e9611..477f85a45755 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -501,12 +501,6 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
>  	 * the configuration of the active one for that purpose (there should
>  	 * be at least one active stream in the configuration request).
>  	 */
> -	if (!mainCfg) {
> -		ret = imgu->configureOutput(*vfCfg, &outputFormat);
> -		if (ret)
> -			return ret;
> -	}
> -
>  	if (!vfCfg) {
>  		ret = imgu->configureViewfinder(*mainCfg, &outputFormat);
>  		if (ret)
> -- 
> 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/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 9cea6c7e9611..477f85a45755 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -501,12 +501,6 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	 * the configuration of the active one for that purpose (there should
 	 * be at least one active stream in the configuration request).
 	 */
-	if (!mainCfg) {
-		ret = imgu->configureOutput(*vfCfg, &outputFormat);
-		if (ret)
-			return ret;
-	}
-
 	if (!vfCfg) {
 		ret = imgu->configureViewfinder(*mainCfg, &outputFormat);
 		if (ret)