]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
media: cedrus: Add support for additional output formats
authorJernej Skrabec <jernej.skrabec@siol.net>
Fri, 23 May 2025 15:43:59 +0000 (17:43 +0200)
committerHans Verkuil <hverkuil@xs4all.nl>
Fri, 20 Jun 2025 11:20:17 +0000 (13:20 +0200)
If VPU supports untiled output, it actually supports several different
YUV 4:2:0 layouts, namely NV12, NV21, YUV420 and YVU420.

Add support for all of them.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: Paul Kocialkowski <paulk@sys-base.io>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
[hverkuil: add 'default' case to switch to fix warning with old compiler]

drivers/staging/media/sunxi/cedrus/cedrus_hw.c
drivers/staging/media/sunxi/cedrus/cedrus_video.c

index 32af0e96e762b490dd9560a8ab4530e0991f593a..444fb53878d1226bad0eaaa8105105e69ec9ede9 100644 (file)
@@ -86,9 +86,26 @@ void cedrus_dst_format_set(struct cedrus_dev *dev,
 
        switch (fmt->pixelformat) {
        case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_YUV420:
+       case V4L2_PIX_FMT_YVU420:
                chroma_size = ALIGN(width, 16) * ALIGN(height, 16) / 2;
 
-               reg = VE_PRIMARY_OUT_FMT_NV12;
+               switch (fmt->pixelformat) {
+               case V4L2_PIX_FMT_NV12:
+                       reg = VE_PRIMARY_OUT_FMT_NV12;
+                       break;
+               case V4L2_PIX_FMT_NV21:
+                       reg = VE_PRIMARY_OUT_FMT_NV21;
+                       break;
+               case V4L2_PIX_FMT_YUV420:
+                       reg = VE_PRIMARY_OUT_FMT_YU12;
+                       break;
+               case V4L2_PIX_FMT_YVU420:
+               default:
+                       reg = VE_PRIMARY_OUT_FMT_YV12;
+                       break;
+               }
                cedrus_write(dev, VE_PRIMARY_OUT_FMT, reg);
 
                reg = chroma_size / 2;
index 77f78266f406288cfd5aa666dd5e3409b5a770cf..9fae2c7493d090878a9f4f0f3923b1c6fd96dbe3 100644 (file)
@@ -64,6 +64,21 @@ static struct cedrus_format cedrus_formats[] = {
                .pixelformat    = V4L2_PIX_FMT_NV12_32L32,
                .directions     = CEDRUS_DECODE_DST,
        },
+       {
+               .pixelformat    = V4L2_PIX_FMT_NV21,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
+       {
+               .pixelformat    = V4L2_PIX_FMT_YUV420,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
+       {
+               .pixelformat    = V4L2_PIX_FMT_YVU420,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
 };
 
 #define CEDRUS_FORMATS_COUNT   ARRAY_SIZE(cedrus_formats)
@@ -140,6 +155,9 @@ void cedrus_prepare_format(struct v4l2_pix_format *pix_fmt)
                break;
 
        case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_YUV420:
+       case V4L2_PIX_FMT_YVU420:
                /* 16-aligned stride. */
                bytesperline = ALIGN(width, 16);