1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

mpeg2enc: Don't mark all streams as component video

Since there is no information about the source format, "unspecified"
is the correct value to write here.

All tests using the MPEG-2 encoder are updated, as this changes the
header on all outputs.
This commit is contained in:
Mark Thompson 2017-08-12 22:16:13 +01:00
parent b78c30d7ec
commit 4c0588b456
19 changed files with 19 additions and 19 deletions

View File

@ -297,7 +297,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
put_header(s, EXT_START_CODE);
put_bits(&s->pb, 4, 2); // sequence display extension
put_bits(&s->pb, 3, 0); // video_format: 0 is components
put_bits(&s->pb, 3, 5); // video_format: 5 is unspecified
put_bits(&s->pb, 1, 1); // colour_description
put_bits(&s->pb, 8, s->avctx->color_primaries); // colour_primaries
put_bits(&s->pb, 8, s->avctx->color_trc); // transfer_characteristics

View File

@ -1,3 +1,3 @@
a1cf0a335ad64ec526bb69bbca0656c2 *./tests/data/lavf/lavf.gxf
bfc25e31136275aff0f9126610b8a7e4 *./tests/data/lavf/lavf.gxf
796428 ./tests/data/lavf/lavf.gxf
./tests/data/lavf/lavf.gxf CRC=0xd04c769f

View File

@ -1,3 +1,3 @@
051b982c1b5799eb107339735a090c70 *./tests/data/lavf/lavf.mxf
7c9efc1b6f5fc65bf39177887512fefd *./tests/data/lavf/lavf.mxf
525881 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x773f059a

View File

@ -1,3 +1,3 @@
96f933913835a439dd97144303dc8929 *./tests/data/lavf/lavf.mxf_d10
5fbb6252f6b146cd36d1491ca96ad8a3 *./tests/data/lavf/lavf.mxf_d10
5330989 ./tests/data/lavf/lavf.mxf_d10
./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480

View File

@ -1,3 +1,3 @@
f74d6f4d4073f4242cec3d5fee099779 *./tests/data/lavf/lavf.ts
7a479525b7dc9264291cb2fc3e1d28e5 *./tests/data/lavf/lavf.ts
406456 ./tests/data/lavf/lavf.ts
./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc

View File

@ -1,4 +1,4 @@
50c344f0e0e3c65001a68b2c899a283f *tests/data/fate/vsynth1-mpeg2.mpeg2video
080866b0a4570c672ccc7cf3e6e7bec7 *tests/data/fate/vsynth1-mpeg2.mpeg2video
728104 tests/data/fate/vsynth1-mpeg2.mpeg2video
b41ca49c1a02e66ce64d262e2cdaec15 *tests/data/fate/vsynth1-mpeg2.out.rawvideo
stddev: 7.65 PSNR: 30.45 MAXDIFF: 84 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
c2124749526d2d4d41398d52557fad1b *tests/data/fate/vsynth1-mpeg2-422.mpeg2video
e59f232030cd0fb7e7839e3f8cd6a1b7 *tests/data/fate/vsynth1-mpeg2-422.mpeg2video
728260 tests/data/fate/vsynth1-mpeg2-422.mpeg2video
eb7fe83ce09af2d79ec16577c9d44e3c *tests/data/fate/vsynth1-mpeg2-422.out.rawvideo
stddev: 10.29 PSNR: 27.88 MAXDIFF: 168 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
d0cc23c61c4afcfdf0fea53b31c6df38 *tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
308f13d87d676c5c2964d25ee98fd58d *tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
725728 tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
8130f71a467315c9e7bd1a25a01dbb23 *tests/data/fate/vsynth1-mpeg2-idct-int.out.rawvideo
stddev: 7.65 PSNR: 30.45 MAXDIFF: 80 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
c8e27cddb2da4d76816c258b6e3d1fab *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
aad9db175e5737ab64a6615879cc7f45 *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
737533 tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
97615390fdd69abfcbc7e02df863a7d2 *tests/data/fate/vsynth1-mpeg2-ilace.out.rawvideo
stddev: 7.67 PSNR: 30.43 MAXDIFF: 84 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
ba08be2c6209f6b88be97e6fe74911db *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
b8bcbf82af12bef19b62a65e1cd19ac4 *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
783612 tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
98eb9da15f880978e7f2ee1e7ce476ef *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.out.rawvideo
stddev: 10.07 PSNR: 28.06 MAXDIFF: 165 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
c17bee51286e13b0c95a504391632087 *tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
e93f5d45ee16e5daa76f6fa670b93002 *tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
801373 tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
d1658911ca83f5616c1d32abc40750de *tests/data/fate/vsynth1-mpeg2-thread.out.rawvideo
stddev: 7.63 PSNR: 30.48 MAXDIFF: 110 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
9f3991d18d5dc5240ca61b158ce76521 *tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
a6399b82227292955612b0917c7ef4ca *tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
791833 tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
d1658911ca83f5616c1d32abc40750de *tests/data/fate/vsynth1-mpeg2-thread-ivlc.out.rawvideo
stddev: 7.63 PSNR: 30.48 MAXDIFF: 110 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
48d5feed5d7866457216577a75b60d59 *tests/data/fate/vsynth2-mpeg2.mpeg2video
0cf4cc4acbd5e19196890b66d88a428a *tests/data/fate/vsynth2-mpeg2.mpeg2video
268229 tests/data/fate/vsynth2-mpeg2.mpeg2video
5887392ff0a05babc480e9f29a1797a3 *tests/data/fate/vsynth2-mpeg2.out.rawvideo
stddev: 5.55 PSNR: 33.23 MAXDIFF: 77 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
392cd150d65892060374ef0ca98b53c3 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video
cf1ee8bc65f87fbe7b7ee76545bd45a9 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video
379371 tests/data/fate/vsynth2-mpeg2-422.mpeg2video
fa9fda9c92a455b39ae7e516b7de6919 *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo
stddev: 4.16 PSNR: 35.73 MAXDIFF: 70 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
4fa4ce9e167fb1816522126d36acfd3c *tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
5e121ff369249a98e080a50af2dadbbb *tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
267430 tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
b750f48d58f157da94613fe92012e7a5 *tests/data/fate/vsynth2-mpeg2-idct-int.out.rawvideo
stddev: 5.56 PSNR: 33.22 MAXDIFF: 77 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
be3bd3d5393320419e82afaaea6c6fb6 *tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
39c214a63ef520d00594ca1f37c5872a *tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
275014 tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
fe069b1be5c6aa5808c0840008485912 *tests/data/fate/vsynth2-mpeg2-ilace.out.rawvideo
stddev: 5.57 PSNR: 33.20 MAXDIFF: 77 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
5e938746a4b50f496db6faa10cbe98d6 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
f6851fb214f3b5205362a32b06ab4917 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
269774 tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
91316e6e990ee20b4a8de33f9e6adc56 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.out.rawvideo
stddev: 5.54 PSNR: 33.25 MAXDIFF: 94 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
722c04a6a442e0ae716e879dff4b6639 *tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
4f68b8830ee1ed90526fb543ea3b9573 *tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
230678 tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
f35531461e7b31bfba66802954329f2e *tests/data/fate/vsynth2-mpeg2-thread.out.rawvideo
stddev: 5.31 PSNR: 33.62 MAXDIFF: 73 bytes: 7603200/ 7603200

View File

@ -1,4 +1,4 @@
32abf166f7a6fdb8e4b46795a60761cc *tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
fdae42a7f9d5f5ed97ae134be1c991e7 *tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
227906 tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
f35531461e7b31bfba66802954329f2e *tests/data/fate/vsynth2-mpeg2-thread-ivlc.out.rawvideo
stddev: 5.31 PSNR: 33.62 MAXDIFF: 73 bytes: 7603200/ 7603200