[FFmpeg-devel] [PATCH] avformat/riff: map Y410 fourcc to RAWVIDEO decoder
James Almer
jamrial at gmail.com
Sun Oct 13 02:05:31 EEST 2024
md5 values change because the nut container now reports rawvideo as encoder
and Y410 as codec type instead of the bogus RGB[15].
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavcodec/raw.c | 1 +
libavformat/riff.c | 1 +
tests/ref/fate/filter-pixdesc-xv30le | 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 adc189b26a..b6c1dea8c1 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -73,6 +73,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
{ AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
{ AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */
+ { AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') },
/* nut */
{ AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 88c4d6cbe9..a882602220 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -222,6 +222,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '0') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'N', 'V') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'V') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'N', 'Y') },
diff --git a/tests/ref/fate/filter-pixdesc-xv30le b/tests/ref/fate/filter-pixdesc-xv30le
index 9b5ad5417e..5960dc34eb 100644
--- a/tests/ref/fate/filter-pixdesc-xv30le
+++ b/tests/ref/fate/filter-pixdesc-xv30le
@@ -1 +1 @@
-pixdesc-xv30le fb76a14d6d5cf3a0b48f30b2fb59becd
+pixdesc-xv30le 701d821940e3f837864393e1c7878843
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index 51bc3d8a83..dbc9947a47 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -105,7 +105,7 @@ vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee
vyu444 93912234400a4373b1a6b5c4e4b1a4ef
x2bgr10le 550c0d190cf695afa4eaacb644db6b75
x2rgb10le c1e3ac21be04a16bb157b22784524520
-xv30le c14b5a953bf3be56346f66ca174a5b1b
+xv30le 718bf036d13f9f1ea8804c2658dd53fa
xv36le 6b8e46832aa8537a774e93dd7503c700
xyz12be a1ef56bf746d71f59669c28e48fc8450
xyz12le 831ff03c1ba4ef19374686f16a064d8c
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 8423d3ed92..ef2fa68db0 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -102,7 +102,7 @@ vuyx 615241c5406eb556fca0ad8606c23a02
vyu444 5d976b25782ff69e4b3b18453fa1447b
x2bgr10le 84de725b85662c362862820dc4a309aa
x2rgb10le f4265aca7a67dbfa9354370098ca6f33
-xv30le a9edb820819b900a4a897fee4562a4fb
+xv30le efebde9ca614024cd7ed95c7c02e9281
xv36le 567af630bf0209e026e0909b3ca9c436
xyz12be cb4571f9aaa7b59f999ef327276104b7
xyz12le cd6aae8d26b18bdb4b9d068586276d91
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 8037e3206c..6e500bdff7 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -105,7 +105,7 @@ vuyx 3d02eeab336d0a8106f6fdd91be61073
vyu444 b139fb4ddaef12a7542a68277211efa7
x2bgr10le dbe21538d7cb1744914f6bd46ec09b55
x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677
-xv30le e940366c78efc9e292e9de28cf04dba9
+xv30le 298f6f14c5bfc18587cd1c3225287a39
xv36le e05a99fc3edc8f26cb2dbd287c0a0fcf
xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437
xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 948001feff..890b9191c6 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -94,7 +94,7 @@ vuyx 9e4480c5fcb7c091ec3e517420764ef3
vyu444 3ddab207d561a3ee5efae09e504207f2
x2bgr10le 86474d84f26c5c51d6f75bf7e1de8da8
x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676
-xv30le 25aac48128d94010a3660839500caee5
+xv30le bfd6693b5e995f65b130d963a972c34e
xv36le 1f054a1ba4c8f8875ffd15d3d1baccba
xyz12be 15f5cda71de5fef9cec5e75e3833b6bc
xyz12le 7be6c8781f38c21a6b8f602f62ca31e6
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index 04daa8ddd3..e12999a15a 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -102,7 +102,7 @@ vuyx f1d087284fb1556d76e6def5f94bf273
vyu444 7b72337f92a7223fd115265e2f769276
x2bgr10le 827cc659f29378e00c5a7d2c0ada8f9a
x2rgb10le d4a8189b65395a88d0a38a7053f3359f
-xv30le 072aa2b61ce1e764f9d1957e8abee9a9
+xv30le 79c6fe0c957d4fdc7bd6d056b13d7ceb
xv36le 6e9c3d2334f9fe2a0e6156615e53e272
xyz12be 25f90259ff8a226befdaec3dfe82996e
xyz12le 926c0791d59aaff61b2778e8ada3316d
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index c5374d5112..56bec41e4a 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -104,7 +104,7 @@ vuyx 4251d94ee49e6a3cc1c10c09cd331308
vyu444 50e9e24a38afc81541a536d06aab5ebe
x2bgr10le 135acaff8318cf9861bb0f7849a9e5e9
x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94
-xv30le 7f6414a3fc700380025c29812e8376a9
+xv30le b18e762bfc505cdd51bac3401c019613
xv36le cfebfdccb16087207bab0b1909c9d85c
xyz12be 7c7d54c55f136cbbc50b18029f3be0b3
xyz12le 090ba6b1170baf2b1358b43b971d33b0
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index 51bc3d8a83..dbc9947a47 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -105,7 +105,7 @@ vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee
vyu444 93912234400a4373b1a6b5c4e4b1a4ef
x2bgr10le 550c0d190cf695afa4eaacb644db6b75
x2rgb10le c1e3ac21be04a16bb157b22784524520
-xv30le c14b5a953bf3be56346f66ca174a5b1b
+xv30le 718bf036d13f9f1ea8804c2658dd53fa
xv36le 6b8e46832aa8537a774e93dd7503c700
xyz12be a1ef56bf746d71f59669c28e48fc8450
xyz12le 831ff03c1ba4ef19374686f16a064d8c
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 7b2ef3ac29..60b968a9bf 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -105,7 +105,7 @@ vuyx a6ff68f46c6b4b7595ec91b2a497df8e
vyu444 d663334119da56e36aca1e8e4eb29a39
x2bgr10le d57b9a99033cc7b65ddd111578f2d385
x2rgb10le d56bdb23fa6a8e12a0b4394987f89935
-xv30le afe68d8a47e8460e0164970b1da0c5be
+xv30le aaee6b4eff276709715fa83073ae87a4
xv36le 4242e35b87fcdfbc3f17370c591577c7
xyz12be c7ba8345998c0141ddc079cdd29b1a40
xyz12le 95f5d3a0de834cc495c9032a14987cde
diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose
index b56392d167..54798f2276 100644
--- a/tests/ref/fate/filter-pixfmts-transpose
+++ b/tests/ref/fate/filter-pixfmts-transpose
@@ -94,7 +94,7 @@ vuyx 46b5b821d7ee6ddedb3ddafd1e5b007c
vyu444 e70a294738165223928fddc9970b8381
x2bgr10le 4aa774b6d8f6d446a64f1f288e5c97eb
x2rgb10le 09cb1d98fe17ad8a6d9d3bec97ddc845
-xv30le b1ac5a12f46d32c70acb63f89838ab76
+xv30le da27f069e340e756a9bb29f628ed06d1
xv36le a819ca57db4187a3effe2bd5e374e932
xyz12be 68e5cba640f6e4ef72dff950e88b5342
xyz12le 8b6b6a6db4d7561e80db88ccaecce7a9
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 5f11e75be9..8c0651090f 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -105,7 +105,7 @@ vuyx ed7de87da324b39090a8961dfd56ca5a
vyu444 815de7c57dc8afafb3de908a4a280582
x2bgr10le 795b66a5fc83cd2cf300aae51c230f80
x2rgb10le 262c502230cf3724f8e2cf4737f18a42
-xv30le 7e29ee107a1fabf3c7251f337d4b9fe5
+xv30le 2cb6ce5f744b33d53cd39a2ea2ab00f3
xv36le bf1cbef0745f90881e15f5c5db3c5949
xyz12be 23fa9fb36d49dce61e284d41b83e0e6b
xyz12le ef73e6d1f932a9a355df1eedd628394f
--
2.46.2
More information about the ffmpeg-devel
mailing list