[v2,08/35] libcamera: converter_v4l2_m2m: Always set stride
diff mbox series

Message ID 20251023144841.403689-9-stefan.klug@ideasonboard.com
State New
Headers show
Series
  • Full dewarper support on imx8mp
Related show

Commit Message

Stefan Klug Oct. 23, 2025, 2:48 p.m. UTC
Ensure the stride is properly set after a call to validateOutput().

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

---

Changes in v2:
- Collected tag
---
 src/libcamera/converter/converter_v4l2_m2m.cpp | 1 +
 1 file changed, 1 insertion(+)

Comments

Isaac Scott Oct. 24, 2025, 9:53 a.m. UTC | #1
Hi Stefan,

Thank you for the patch!

Quoting Stefan Klug (2025-10-23 15:48:09)
> Ensure the stride is properly set after a call to validateOutput().
> 
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> ---
> 
> Changes in v2:
> - Collected tag
> ---
>  src/libcamera/converter/converter_v4l2_m2m.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp
> index c6153d728c9a..e57db8a438ab 100644
> --- a/src/libcamera/converter/converter_v4l2_m2m.cpp
> +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp
> @@ -680,6 +680,7 @@ int V4L2M2MConverter::validateOutput(StreamConfiguration *cfg, bool *adjusted,
>  
>         const Size cfgSize = cfg->size;
>         cfg->size = adjustSizes(cfgSize, it->second, align);
> +       cfg->stride = PixelFormatInfo::info(cfg->pixelFormat).stride(cfg->size.width, 0);

Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>

>  
>         if (cfg->size.isNull())
>                 return -EINVAL;
> -- 
> 2.48.1
>
Umang Jain Oct. 25, 2025, 1:44 p.m. UTC | #2
On Thu, Oct 23, 2025 at 04:48:09PM +0200, Stefan Klug wrote:
> Ensure the stride is properly set after a call to validateOutput().
> 
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Umang Jain <uajain@igalia.com>

> 
> ---
> 
> Changes in v2:
> - Collected tag
> ---
>  src/libcamera/converter/converter_v4l2_m2m.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp
> index c6153d728c9a..e57db8a438ab 100644
> --- a/src/libcamera/converter/converter_v4l2_m2m.cpp
> +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp
> @@ -680,6 +680,7 @@ int V4L2M2MConverter::validateOutput(StreamConfiguration *cfg, bool *adjusted,
>  
>  	const Size cfgSize = cfg->size;
>  	cfg->size = adjustSizes(cfgSize, it->second, align);
> +	cfg->stride = PixelFormatInfo::info(cfg->pixelFormat).stride(cfg->size.width, 0);
>  
>  	if (cfg->size.isNull())
>  		return -EINVAL;
> -- 
> 2.48.1
>
Paul Elder Nov. 5, 2025, 4:46 p.m. UTC | #3
Quoting Stefan Klug (2025-10-23 23:48:09)
> Ensure the stride is properly set after a call to validateOutput().
> 
> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Looks good to me.

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

> 
> ---
> 
> Changes in v2:
> - Collected tag
> ---
>  src/libcamera/converter/converter_v4l2_m2m.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp
> index c6153d728c9a..e57db8a438ab 100644
> --- a/src/libcamera/converter/converter_v4l2_m2m.cpp
> +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp
> @@ -680,6 +680,7 @@ int V4L2M2MConverter::validateOutput(StreamConfiguration *cfg, bool *adjusted,
>  
>         const Size cfgSize = cfg->size;
>         cfg->size = adjustSizes(cfgSize, it->second, align);
> +       cfg->stride = PixelFormatInfo::info(cfg->pixelFormat).stride(cfg->size.width, 0);
>  
>         if (cfg->size.isNull())
>                 return -EINVAL;
> -- 
> 2.48.1
>

Patch
diff mbox series

diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp
index c6153d728c9a..e57db8a438ab 100644
--- a/src/libcamera/converter/converter_v4l2_m2m.cpp
+++ b/src/libcamera/converter/converter_v4l2_m2m.cpp
@@ -680,6 +680,7 @@  int V4L2M2MConverter::validateOutput(StreamConfiguration *cfg, bool *adjusted,
 
 	const Size cfgSize = cfg->size;
 	cfg->size = adjustSizes(cfgSize, it->second, align);
+	cfg->stride = PixelFormatInfo::info(cfg->pixelFormat).stride(cfg->size.width, 0);
 
 	if (cfg->size.isNull())
 		return -EINVAL;