avformat/riff: map Y210 and Y216 fourcc to RAWVIDEO decoder

As defined in https://learn.microsoft.com/en-us/windows/win32/medfound/10-bit-and-16-bit-yuv-video-formats#422-formats

James Almer committed 2 years ago

Commit faec8761 parent db7b4fc11 files · +20 −16Browse files

Unified · Split

11 files

libavcodec/raw.c +2 −0
libavformat/riff.c +2 −0
tests/ref/fate/filter-pixdesc-y210le +1 −1
tests/ref/fate/filter-pixdesc-y216le +1 −1
tests/ref/fate/filter-pixfmts-copy +2 −2
tests/ref/fate/filter-pixfmts-field +2 −2
tests/ref/fate/filter-pixfmts-fieldorder +2 −2
tests/ref/fate/filter-pixfmts-il +2 −2
tests/ref/fate/filter-pixfmts-null +2 −2
tests/ref/fate/filter-pixfmts-scale +2 −2
tests/ref/fate/filter-pixfmts-vflip +2 −2

libavcodec/raw.c+2−0

@@ -74,6 +74,8 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { · 73 unmodified lines
74	74	{ AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
75	75	{ AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */
76	76	{ AV_PIX_FMT_XV30LE, MKTAG('Y', '4', '1', '0') },
	77	+ { AV_PIX_FMT_Y210LE, MKTAG('Y', '2', '1', '0') },
	78	+ { AV_PIX_FMT_Y216LE, MKTAG('Y', '2', '1', '6') },
77	79
78	80	/* nut */
79	81	{ AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },

libavformat/riff.c+2−0

@@ -220,6 +220,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { · 219 unmodified lines
220	220	{ AV_CODEC_ID_RAWVIDEO, MKTAG( 3 , 0 , 0 , 0 ) },
221	221	{ AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
222	222	{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'Y', '2') },
	223	+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', '1', '0') },
	224	+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', '1', '6') },
223	225	{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
224	226	{ AV_CODEC_ID_RAWVIDEO, MKTAG('V', '4', '2', '2') },
225	227	{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '0') },

tests/ref/fate/filter-pixdesc-y210le+1−1

@@ -1 +1 @@
1		−pixdesc-y210le 7b0ba4b531e7dccca7f2a49102b23991
	1	+pixdesc-y210le a66dba4aa4dca748a2dc2bd5f3619e5f

tests/ref/fate/filter-pixdesc-y216le+1−1

@@ -1 +1 @@
1		−pixdesc-y216le ff17fa6e341a5cfe0d549faa25c24257
	1	+pixdesc-y216le a7d1e552815201d1df4d731b32968e8a

tests/ref/fate/filter-pixfmts-copy+2−2

@@ -111,9 +111,9 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 · 110 unmodified lines
111	111	xv36le e08dcbde02f1c28a3554f372ad1278e2
112	112	xyz12be a1ef56bf746d71f59669c28e48fc8450
113	113	xyz12le 831ff03c1ba4ef19374686f16a064d8c
114		−y210le 0736b017e0814daf38d3350c42796f7a
	114	+y210le 04e9487b6cce38e7531437e946cdd586
115	115	y212le 825768be8fe92708ae80be84855066ed
116		−y216le 610cc638e695eb64f3004cc5f24c5a7b
	116	+y216le 0e99aeddfee304e72d525d72998d9e9b
117	117	ya16be 37c07787e544f900c87b853253bfc8dd
118	118	ya16le e8cab8fad88cba6d285b224d8bf0d4df
119	119	ya8 dbb99fbcdc204aaa1a7397ff561f1a67

tests/ref/fate/filter-pixfmts-field+2−2

@@ -111,9 +111,9 @@ xv36be bcc7bda2d0a5d43db4464af6a4cb5d65 · 110 unmodified lines
111	111	xv36le ba99f258370f2a56993e8760e6b30194
112	112	xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437
113	113	xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5
114		−y210le 025beb25f047a762e3788dbea4b60864
	114	+y210le 4c2fba1dc40322584977d15dd07c9146
115	115	y212le ac2a47c45187dd54d0f55293cbffd954
116		−y216le 332801737b0f779bdf14ff535fd925fd
	116	+y216le e65b5bfae1b40edbbed2012e9cd45e31
117	117	ya16be 40403b5277364777e0671da4d38e01ac
118	118	ya16le 54f3295f5326a13d456ac53e973ba398
119	119	ya8 28cea4f98ed452bd3da9c752e5e3399c

tests/ref/fate/filter-pixfmts-fieldorder+2−2

@@ -100,9 +100,9 @@ xv36be 962386c88268f4382004c3a7a82c5eb8 · 99 unmodified lines
100	100	xv36le bcceffc985aaa8414c4b8072aa0889bd
101	101	xyz12be 15f5cda71de5fef9cec5e75e3833b6bc
102	102	xyz12le 7be6c8781f38c21a6b8f602f62ca31e6
103		−y210le ee45acfb1386288af98af5313162ff3e
	103	+y210le 22b1a02a39c4b325726bf8793bf1e8f2
104	104	y212le 2f08fb195b948056c844acb1eee8d649
105		−y216le 4176a190d167f0f6d7dbca7ff65d3f48
	105	+y216le 360cb98ac80b13d3a8ec61c9f1ff3bac
106	106	ya16be 0f13e0f52586d172aaa07710fa3e8f31
107	107	ya16le d481d93ea1a1a04d759d9994958983de
108	108	ya8 055ac5ab5ff8533dd319edc17a398af1

tests/ref/fate/filter-pixfmts-il+2−2

@@ -110,9 +110,9 @@ xv36be 3bbb949278ea55cc947ee03bd9c27c2d · 109 unmodified lines
110	110	xv36le 102c0e817d375ddd6b2cfbb4262dec95
111	111	xyz12be 7c7d54c55f136cbbc50b18029f3be0b3
112	112	xyz12le 090ba6b1170baf2b1358b43b971d33b0
113		−y210le 306ec4238b49dbc8625a97b678ea1c5f
	113	+y210le d4cf9b53cd7ff22f087743d483e88480
114	114	y212le d5a2b4677ddb4a3bc3e5cd5cbb20f426
115		−y216le ef6d5ebd8bf99809fb8ac658cf7acbf8
	115	+y216le 9e44c6d76b09bcbe71738423b4b3d67a
116	116	ya16be 7bc720918bc0132e9717acbde89874e0
117	117	ya16le 61203295a8d39601b841de90f2c9797b
118	118	ya8 a38d6e288f582f1a04310232ed764afc

tests/ref/fate/filter-pixfmts-null+2−2

@@ -111,9 +111,9 @@ xv36be 9f556ee59a672fd8725f0bb36ce3e4b0 · 110 unmodified lines
111	111	xv36le e08dcbde02f1c28a3554f372ad1278e2
112	112	xyz12be a1ef56bf746d71f59669c28e48fc8450
113	113	xyz12le 831ff03c1ba4ef19374686f16a064d8c
114		−y210le 0736b017e0814daf38d3350c42796f7a
	114	+y210le 04e9487b6cce38e7531437e946cdd586
115	115	y212le 825768be8fe92708ae80be84855066ed
116		−y216le 610cc638e695eb64f3004cc5f24c5a7b
	116	+y216le 0e99aeddfee304e72d525d72998d9e9b
117	117	ya16be 37c07787e544f900c87b853253bfc8dd
118	118	ya16le e8cab8fad88cba6d285b224d8bf0d4df
119	119	ya8 dbb99fbcdc204aaa1a7397ff561f1a67

tests/ref/fate/filter-pixfmts-scale+2−2

@@ -111,9 +111,9 @@ xv36be 4d084adca0228d7750d1e2e877e0d79b · 110 unmodified lines
111	111	xv36le de9c74e94dc19c828e1572aa283d8aca
112	112	xyz12be c7ba8345998c0141ddc079cdd29b1a40
113	113	xyz12le 95f5d3a0de834cc495c9032a14987cde
114		−y210le 1c2708a520477f955d1fedf6ca7a41bd
	114	+y210le 7c2aef142d88ab343ec01acd45f38466
115	115	y212le 39a3c0c843041ad4501b3107dd91ef17
116		−y216le 21ead8be695827822e627df20ab49b1f
	116	+y216le 17be2999e97d36b8ed903f07ef428c09
117	117	ya16be 20d4842899d61068f5fb6af478bf26a6
118	118	ya16le 6a05895adce85143ae1c1b3470cb4070
119	119	ya8 0a9db5bb4b009de9197eede5e9d19e16

tests/ref/fate/filter-pixfmts-vflip+2−2

@@ -111,9 +111,9 @@ xv36be c0272372d3e1a59adb3931ee433a5d5b · 110 unmodified lines
111	111	xv36le ffe6ab75ebc09134c3451f8f6ef0d501
112	112	xyz12be 23fa9fb36d49dce61e284d41b83e0e6b
113	113	xyz12le ef73e6d1f932a9a355df1eedd628394f
114		−y210le 9544c81f8e1fc95e9fa4009dbecfea25
	114	+y210le f8847bedd3ae6e1c0cf84a823f275e31
115	115	y212le c801725ae31e3b8f5be269359d49f191
116		−y216le 0ca0f60d7fd78ec32f417d6209f18a5b
	116	+y216le 985db498aedf3fb1c547ad07442b7258
117	117	ya16be 55b1dbbe4d56ed0d22461685ce85520d
118	118	ya16le d5bf02471823a16dc523a46cace0101a
119	119	ya8 4299c6ca3b470a7d8a420e26eb485b1d