[libcamera-devel,v4,13/31] libcamera: ipu3: Use NV12 as default image format

Message ID 20190320163055.22056-14-jacopo@jmondi.org
State Superseded
Headers show
Series
  • libcamera: ipu3: Add ImgU support + multiple streams
Related show

Commit Message

Jacopo Mondi March 20, 2019, 4:30 p.m. UTC
Now that images come from the ImgU output, hardcode NV12 as default
output format.

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

Comments

Laurent Pinchart March 21, 2019, 10:18 a.m. UTC | #1
Hi Jacopo,

Thank you for the patch.

On Wed, Mar 20, 2019 at 05:30:37PM +0100, Jacopo Mondi wrote:
> Now that images come from the ImgU output, hardcode NV12 as default
> output format.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
> ---
>  src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
> index 2623b2fe65f1..b99aae95c6d7 100644
> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp
> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
> @@ -211,16 +211,16 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,
>  
>  			config->width = range.maxWidth;
>  			config->height = range.maxHeight;
> -			config->pixelFormat = cio2Code;
>  		}
>  	}
>  
> +	config->pixelFormat = V4L2_PIX_FMT_NV12;
>  	config->bufferCount = IPU3_BUFFER_COUNT;
>  
>  	LOG(IPU3, Debug)
>  		<< "Stream format set to: " << config->width << "x"
>  		<< config->height << "- 0x" << std::hex << std::setfill('0')

Spaces or no spaces around dash, please pick one. Apart from that,

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

> -		<< std::setw(4) << config->pixelFormat;
> +		<< std::setw(8) << config->pixelFormat;
>  
>  	return configs;
>  }

Patch

diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 2623b2fe65f1..b99aae95c6d7 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -211,16 +211,16 @@  PipelineHandlerIPU3::streamConfiguration(Camera *camera,
 
 			config->width = range.maxWidth;
 			config->height = range.maxHeight;
-			config->pixelFormat = cio2Code;
 		}
 	}
 
+	config->pixelFormat = V4L2_PIX_FMT_NV12;
 	config->bufferCount = IPU3_BUFFER_COUNT;
 
 	LOG(IPU3, Debug)
 		<< "Stream format set to: " << config->width << "x"
 		<< config->height << "- 0x" << std::hex << std::setfill('0')
-		<< std::setw(4) << config->pixelFormat;
+		<< std::setw(8) << config->pixelFormat;
 
 	return configs;
 }