[libcamera-devel] [PATCH] libcamera: pipeline: vimc: Fix configuration validation

[Kieran Bingham]

Hi Laurent,

On 25/08/2020 18:08, Laurent Pinchart wrote:
> The sensor aligns the width and height to multiples of two pixels, and
> the scaler has a x3 hardcoded factor. The output size must thus be
> aligned to 6 pixels, not 3. Fix it.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

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

> ---
>  src/libcamera/pipeline/vimc/vimc.cpp | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
> index 7e237650b448..d192670bbc8f 100644
> --- a/src/libcamera/pipeline/vimc/vimc.cpp
> +++ b/src/libcamera/pipeline/vimc/vimc.cpp
> @@ -149,11 +149,15 @@ CameraConfiguration::Status VimcCameraConfiguration::validate()
>  	/* Clamp the size based on the device limits. */
>  	const Size size = cfg.size;
>  
> -	/* The scaler hardcodes a x3 scale-up ratio. */
> +	/*
> +	 * The scaler hardcodes a x3 scale-up ratio, and the sensor output size
> +	 * is aligned to two pixels in both directions. The output width and
> +	 * height thus have to be multiples of 6.
> +	 */
>  	cfg.size.width = std::max(48U, std::min(4096U, cfg.size.width));
>  	cfg.size.height = std::max(48U, std::min(2160U, cfg.size.height));
> -	cfg.size.width -= cfg.size.width % 3;
> -	cfg.size.height -= cfg.size.height % 3;
> +	cfg.size.width -= cfg.size.width % 6;
> +	cfg.size.height -= cfg.size.height % 6;
>  
>  	if (cfg.size != size) {
>  		LOG(VIMC, Debug)
> 

-- 
Regards
--
Kieran