[FFmpeg-devel] [PATCH 13/21] avformat/riff: map v410 fourcc to RAWVIDEO decoder

James Almer jamrial at gmail.com
Wed Oct 9 01:50:18 EEST 2024


There's no need to keep using a custom decoder for this pixel format.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavcodec/raw.c                         | 1 +
 libavformat/riff.c                       | 1 +
 tests/ref/fate/filter-pixdesc-v30xle     | 2 +-
 tests/ref/fate/filter-pixfmts-copy       | 2 +-
 tests/ref/fate/filter-pixfmts-crop       | 2 +-
 tests/ref/fate/filter-pixfmts-field      | 2 +-
 tests/ref/fate/filter-pixfmts-fieldorder | 2 +-
 tests/ref/fate/filter-pixfmts-hflip      | 2 +-
 tests/ref/fate/filter-pixfmts-il         | 2 +-
 tests/ref/fate/filter-pixfmts-null       | 2 +-
 tests/ref/fate/filter-pixfmts-scale      | 2 +-
 tests/ref/fate/filter-pixfmts-transpose  | 2 +-
 tests/ref/fate/filter-pixfmts-vflip      | 2 +-
 13 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 086823c06e..adc189b26a 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -239,6 +239,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = {
     { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
     { AV_PIX_FMT_VYU444,  MKTAG('v', '3', '0', '8') },
     { AV_PIX_FMT_UYVA,    MKTAG('v', '4', '0', '8') },
+    { AV_PIX_FMT_V30XLE,  MKTAG('v', '4', '1', '0') },
     { AV_PIX_FMT_AYUV,    MKTAG('y', '4', '0', '8') },
     { AV_PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') },
     { AV_PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') },
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7ee04c70f4..7f3291a392 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -298,6 +298,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_RAWVIDEO,     MKTAG('I', '0', 'F', 'B') },
     { AV_CODEC_ID_RAWVIDEO,     MKTAG('v', '3', '0', '8') },
     { AV_CODEC_ID_RAWVIDEO,     MKTAG('v', '4', '0', '8') },
+    { AV_CODEC_ID_RAWVIDEO,     MKTAG('v', '4', '1', '0') },
     { AV_CODEC_ID_RAWVIDEO,     MKTAG('y', '4', '0', '8') },
     { AV_CODEC_ID_FRWU,         MKTAG('F', 'R', 'W', 'U') },
     { AV_CODEC_ID_R10K,         MKTAG('R', '1', '0', 'k') },
diff --git a/tests/ref/fate/filter-pixdesc-v30xle b/tests/ref/fate/filter-pixdesc-v30xle
index b13f30d6b7..c9cfeb0888 100644
--- a/tests/ref/fate/filter-pixdesc-v30xle
+++ b/tests/ref/fate/filter-pixdesc-v30xle
@@ -1 +1 @@
-pixdesc-v30xle      39705ee98e5f00ab0e388e25d7ce7419
+pixdesc-v30xle      96e7b6248f347559d40a5154d36083e0
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index d92246b066..51bc3d8a83 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -99,7 +99,7 @@ rgba64be            ae2ae04b5efedca3505f47c4dd6ea6ea
 rgba64le            b91e1d77f799eb92241a2d2d28437b15
 uyva                8896d7525f12de08818a01a5d5cf84f1
 uyvy422             3bcf3c80047592f2211fae3260b1b65d
-v30xle              b5ec677137b6f1d9f14a2386a1a7a526
+v30xle              1b74b2ae9d93674380964a2ddcdc803e
 vuya                3d5e934651cae1ce334001cb1829ad22
 vuyx                0af13a42f9d0932c5a9bb6a8a5d1c5ee
 vyu444              93912234400a4373b1a6b5c4e4b1a4ef
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index fd7075bc84..8423d3ed92 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -96,7 +96,7 @@ rgba                9488ac85abceaf99a9309eac5a87697e
 rgba64be            89910046972ab3c68e2a348302cc8ca9
 rgba64le            fea8ebfc869b52adf353778f29eac7a7
 uyva                03f362ac6a39f25286bc6616111b0752
-v30xle              f92c959d672e17a3a27351e671757212
+v30xle              4cd15e59ac7a3cc116e8b09edf90af20
 vuya                76578a705ff3a37559653c1289bd03dd
 vuyx                615241c5406eb556fca0ad8606c23a02
 vyu444              5d976b25782ff69e4b3b18453fa1447b
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 7a24cbc8f5..8037e3206c 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -99,7 +99,7 @@ rgba64be            23c8c0edaabe3eaec89ce69633fb0048
 rgba64le            dfdba4de4a7cac9abf08852666c341d3
 uyva                147398d2e8d310f915c95863ad192c5e
 uyvy422             1c49e44ab3f060e85fc4a3a9464f045e
-v30xle              265a463ad722cfaede2fa6cb5e9bf34e
+v30xle              337aab325e9bd1247560b22dae767c29
 vuya                f72bcf29d75cd143d0c565f7cc49119a
 vuyx                3d02eeab336d0a8106f6fdd91be61073
 vyu444              b139fb4ddaef12a7542a68277211efa7
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 9030873369..948001feff 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -88,7 +88,7 @@ rgba64be            5598f44514d122b9a57c5c92c20bbc61
 rgba64le            b34e6e30621ae579519a2d91a96a0acf
 uyva                ccf5dfd33765dda88c4b4afa2ea31305
 uyvy422             75de70e31c435dde878002d3f22b238a
-v30xle              1f04ac91824200d94d7841736c41f728
+v30xle              53fc11848a0a1433761deb62deee087a
 vuya                a3891d4168ff208948fd0b3ba0910495
 vuyx                9e4480c5fcb7c091ec3e517420764ef3
 vyu444              3ddab207d561a3ee5efae09e504207f2
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index a4129859e0..04daa8ddd3 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -96,7 +96,7 @@ rgba                51961c723ea6707e0a410cd3f21f15d3
 rgba64be            c910444019f4cfbf4d995227af55da8d
 rgba64le            0c810d8b3a6bca10321788e1cb145340
 uyva                a8391c24037e2a670196b47bf6a2ca57
-v30xle              1c62803a7a7c0c89e5fda3d41cc0a376
+v30xle              a367069a1da9da215cfca28e4e4e207d
 vuya                7e530261e7ac4eae4fd616fd7572d0b8
 vuyx                f1d087284fb1556d76e6def5f94bf273
 vyu444              7b72337f92a7223fd115265e2f769276
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index 9b61859354..c5374d5112 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -98,7 +98,7 @@ rgba64be            db70d33aa6c06f3e0a1c77bd11284261
 rgba64le            a8a2daae04374a27219bc1c890204007
 uyva                d2655e1a1c56bcb48f7c7a6a6270dd93
 uyvy422             d6ee3ca43356d08c392382b24b22cda5
-v30xle              267a4c668b14157d35399302bb978ac1
+v30xle              a1a9719011f9e20a25b10f4702b10d0e
 vuya                b9deab5ba249dd608b709c09255a4932
 vuyx                4251d94ee49e6a3cc1c10c09cd331308
 vyu444              50e9e24a38afc81541a536d06aab5ebe
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index d92246b066..51bc3d8a83 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -99,7 +99,7 @@ rgba64be            ae2ae04b5efedca3505f47c4dd6ea6ea
 rgba64le            b91e1d77f799eb92241a2d2d28437b15
 uyva                8896d7525f12de08818a01a5d5cf84f1
 uyvy422             3bcf3c80047592f2211fae3260b1b65d
-v30xle              b5ec677137b6f1d9f14a2386a1a7a526
+v30xle              1b74b2ae9d93674380964a2ddcdc803e
 vuya                3d5e934651cae1ce334001cb1829ad22
 vuyx                0af13a42f9d0932c5a9bb6a8a5d1c5ee
 vyu444              93912234400a4373b1a6b5c4e4b1a4ef
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 84730ab3cb..7b2ef3ac29 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -99,7 +99,7 @@ rgba64be            ee73e57923af984b31cc7795d13929da
 rgba64le            783d2779adfafe3548bdb671ec0de69e
 uyva                2358038be6dac002a6c736e798a3d91c
 uyvy422             aeb4ba4f9f003ae21f6d18089198244f
-v30xle              42be9fac7725274bf54012b073ee0e91
+v30xle              eb50190ed5800f979c091a6e39275cbe
 vuya                ffa817e283bf6a0b6fba21b07523ccaa
 vuyx                a6ff68f46c6b4b7595ec91b2a497df8e
 vyu444              d663334119da56e36aca1e8e4eb29a39
diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose
index a7a1918819..b56392d167 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -88,7 +88,7 @@ rgba                4d76a9542143752a4ac30f82f88f68f1
 rgba64be            a60041217f4c0cd796d19d3940a12a41
 rgba64le            ad47197774858858ae7b0c177dffa459
 uyva                cb773ee5a9f8964b9c826d55f9f425a3
-v30xle              8a31095e6eb8e85ab6f030773fa20d03
+v30xle              84548ae5825baa041a96db6bb9c362b0
 vuya                9ece18a345beb17cd19e09e443eca4bf
 vuyx                46b5b821d7ee6ddedb3ddafd1e5b007c
 vyu444              e70a294738165223928fddc9970b8381
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index c7b1015fbb..30e8ef7fc5 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -99,7 +99,7 @@ rgba64be            17e6273323b5779b5f3f775f150c1011
 rgba64le            48f45b10503b7dd140329c3dd0d54c98
 uyva                d43e89ba3d5c9274e1948eac8630fcc6
 uyvy422             3a237e8376264e0cfa78f8a3fdadec8a
-v30xle              1b2e25e974fdcd53b396b577725d33cb
+v30xle              34771be4875c31f8ffbc06c77fd1a49e
 vuya                fb849f76e56181e005c31fce75d7038c
 vuyx                ed7de87da324b39090a8961dfd56ca5a
 vyu444              815de7c57dc8afafb3de908a4a280582
-- 
2.46.2



More information about the ffmpeg-devel mailing list