From: Marton Balint <[email protected]> Improves compatibility with XDCAM HD formats. It has been set for a long time in ffmbc.
Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Marton Balint <[email protected]> --- libavcodec/mpeg12enc.c | 3 ++- tests/ref/lavf/gxf | 2 +- tests/ref/lavf/mpg | 2 +- tests/ref/lavf/mxf | 2 +- tests/ref/lavf/ts | 2 +- tests/ref/vsynth/vsynth1-mpeg1 | 2 +- tests/ref/vsynth/vsynth1-mpeg1b | 2 +- tests/ref/vsynth/vsynth1-mpeg2 | 2 +- tests/ref/vsynth/vsynth1-mpeg2-422 | 2 +- tests/ref/vsynth/vsynth1-mpeg2-idct-int | 2 +- tests/ref/vsynth/vsynth1-mpeg2-ilace | 2 +- tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd | 2 +- tests/ref/vsynth/vsynth1-mpeg2-thread | 2 +- tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc | 2 +- tests/ref/vsynth/vsynth2-mpeg1 | 2 +- tests/ref/vsynth/vsynth2-mpeg1b | 2 +- tests/ref/vsynth/vsynth2-mpeg2 | 2 +- tests/ref/vsynth/vsynth2-mpeg2-422 | 2 +- tests/ref/vsynth/vsynth2-mpeg2-idct-int | 2 +- tests/ref/vsynth/vsynth2-mpeg2-ilace | 2 +- tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd | 2 +- tests/ref/vsynth/vsynth2-mpeg2-thread | 2 +- tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc | 2 +- 23 files changed, 24 insertions(+), 23 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 8f9292f..4547a38 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -324,7 +324,8 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) put_bits(&s->pb, 1, 1); put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); - put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP) || s->intra_only); + put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP) || + s->intra_only || !s->gop_picture_number); put_bits(&s->pb, 1, 0); // broken link } } diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index 8dfd63d..62be3c7 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,3 +1,3 @@ -a1cf0a335ad64ec526bb69bbca0656c2 *./tests/data/lavf/lavf.gxf +cd849d4027339c51b9cdced59ed21e6a *./tests/data/lavf/lavf.gxf 796428 ./tests/data/lavf/lavf.gxf ./tests/data/lavf/lavf.gxf CRC=0xd04c769f diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index e4c8ae0..60da78c 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,3 +1,3 @@ -7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/lavf/lavf.mpg +ea1efe824a60ec4bd6c0967caff7f755 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg ./tests/data/lavf/lavf.mpg CRC=0xdd24439e diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 09e3c36..ac99b59 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,3 +1,3 @@ -051b982c1b5799eb107339735a090c70 *./tests/data/lavf/lavf.mxf +7d7b3458ef8475290cd1031258038fd8 *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x773f059a diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index 8512d26..57aa180 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -3713c852d6ee217ae6a901619df71111 *./tests/data/lavf/lavf.ts +e22956d8cc75584b2e858d3e64baf960 *./tests/data/lavf/lavf.ts 406456 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc diff --git a/tests/ref/vsynth/vsynth1-mpeg1 b/tests/ref/vsynth/vsynth1-mpeg1 index 5f3d703..79754ce 100644 --- a/tests/ref/vsynth/vsynth1-mpeg1 +++ b/tests/ref/vsynth/vsynth1-mpeg1 @@ -1,4 +1,4 @@ -1428744c6d5835f27506e69be4f837f4 *tests/data/fate/vsynth1-mpeg1.mpeg1video +c517f15060df770dae62848b9caccc07 *tests/data/fate/vsynth1-mpeg1.mpeg1video 712006 tests/data/fate/vsynth1-mpeg1.mpeg1video 58f0c332bf689117b57fa629a2bc0d2b *tests/data/fate/vsynth1-mpeg1.out.rawvideo stddev: 7.62 PSNR: 30.48 MAXDIFF: 84 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-mpeg1b b/tests/ref/vsynth/vsynth1-mpeg1b index ddd9bef..4af16f5 100644 --- a/tests/ref/vsynth/vsynth1-mpeg1b +++ b/tests/ref/vsynth/vsynth1-mpeg1b @@ -1,4 +1,4 @@ -777639666b449ab0a7ef260511e40532 *tests/data/fate/vsynth1-mpeg1b.mpeg1video +11b15a09856da4a6dd7dba7a26ff3b79 *tests/data/fate/vsynth1-mpeg1b.mpeg1video 1030337 tests/data/fate/vsynth1-mpeg1b.mpeg1video 91a7fce732b34748e7bf753ebabe2483 *tests/data/fate/vsynth1-mpeg1b.out.rawvideo stddev: 6.30 PSNR: 32.13 MAXDIFF: 75 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-mpeg2 b/tests/ref/vsynth/vsynth1-mpeg2 index d0baa0a..3c2ffc4 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2 +++ b/tests/ref/vsynth/vsynth1-mpeg2 @@ -1,4 +1,4 @@ -50c344f0e0e3c65001a68b2c899a283f *tests/data/fate/vsynth1-mpeg2.mpeg2video +820ba48a201b6955d18f3bd829888537 *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-422 b/tests/ref/vsynth/vsynth1-mpeg2-422 index 1209e88..fd5d664 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-422 +++ b/tests/ref/vsynth/vsynth1-mpeg2-422 @@ -1,4 +1,4 @@ -c2124749526d2d4d41398d52557fad1b *tests/data/fate/vsynth1-mpeg2-422.mpeg2video +d399de0b96fc4b06191f62ea2c1c372a *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-idct-int b/tests/ref/vsynth/vsynth1-mpeg2-idct-int index cc789bb..093a9e8 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-idct-int +++ b/tests/ref/vsynth/vsynth1-mpeg2-idct-int @@ -1,4 +1,4 @@ -d0cc23c61c4afcfdf0fea53b31c6df38 *tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video +f09703d3b5e73830ca3eef35056cc9ea *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-ilace b/tests/ref/vsynth/vsynth1-mpeg2-ilace index 81e43c5..eb84879 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-ilace +++ b/tests/ref/vsynth/vsynth1-mpeg2-ilace @@ -1,4 +1,4 @@ -c8e27cddb2da4d76816c258b6e3d1fab *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video +1de5ab3d6dc0b4ef57b7c177e4bc6338 *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd index 647525d..a246758 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd +++ b/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd @@ -1,4 +1,4 @@ -ba08be2c6209f6b88be97e6fe74911db *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video +058780160d6f72eb030069dce89b983e *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-thread b/tests/ref/vsynth/vsynth1-mpeg2-thread index 1a479bc..2d5723a 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-thread +++ b/tests/ref/vsynth/vsynth1-mpeg2-thread @@ -1,4 +1,4 @@ -c17bee51286e13b0c95a504391632087 *tests/data/fate/vsynth1-mpeg2-thread.mpeg2video +41c7720dc02285c98f8621cb66ace519 *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 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc index b211c94..00cacd9 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc +++ b/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc @@ -1,4 +1,4 @@ -9f3991d18d5dc5240ca61b158ce76521 *tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video +cd9beb6a4bebd1017a55257cdd14a92e *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg1 b/tests/ref/vsynth/vsynth2-mpeg1 index eebc514..e68c97f 100644 --- a/tests/ref/vsynth/vsynth2-mpeg1 +++ b/tests/ref/vsynth/vsynth2-mpeg1 @@ -1,4 +1,4 @@ -9daec4f4e4b6fb8960c3509c84eae0c7 *tests/data/fate/vsynth2-mpeg1.mpeg1video +6af4a487cfd9dde15c6f56cd2d4f841d *tests/data/fate/vsynth2-mpeg1.mpeg1video 262171 tests/data/fate/vsynth2-mpeg1.mpeg1video 33916bea6d2bc5db93aaf38ee706ba46 *tests/data/fate/vsynth2-mpeg1.out.rawvideo stddev: 5.54 PSNR: 33.26 MAXDIFF: 77 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg1b b/tests/ref/vsynth/vsynth2-mpeg1b index 4aab85e..d227737 100644 --- a/tests/ref/vsynth/vsynth2-mpeg1b +++ b/tests/ref/vsynth/vsynth2-mpeg1b @@ -1,4 +1,4 @@ -30d6d3f9b7b4234e74d3ed22c012ab31 *tests/data/fate/vsynth2-mpeg1b.mpeg1video +faa2400692c2d642077c4d2d071b85b2 *tests/data/fate/vsynth2-mpeg1b.mpeg1video 298135 tests/data/fate/vsynth2-mpeg1b.mpeg1video bbac65e2e1fd7e14d83f50072e188852 *tests/data/fate/vsynth2-mpeg1b.out.rawvideo stddev: 4.60 PSNR: 34.87 MAXDIFF: 77 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg2 b/tests/ref/vsynth/vsynth2-mpeg2 index 7f441cb..f57c68f 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2 +++ b/tests/ref/vsynth/vsynth2-mpeg2 @@ -1,4 +1,4 @@ -48d5feed5d7866457216577a75b60d59 *tests/data/fate/vsynth2-mpeg2.mpeg2video +2a69e5a47b4172e09c76b723ce794dd5 *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-422 b/tests/ref/vsynth/vsynth2-mpeg2-422 index ea30134..7a932ea 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-422 +++ b/tests/ref/vsynth/vsynth2-mpeg2-422 @@ -1,4 +1,4 @@ -392cd150d65892060374ef0ca98b53c3 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video +4e42f7d76294ac397f844482d5d7a335 *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-idct-int b/tests/ref/vsynth/vsynth2-mpeg2-idct-int index fe1ed8d..e2a7ef3 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-idct-int +++ b/tests/ref/vsynth/vsynth2-mpeg2-idct-int @@ -1,4 +1,4 @@ -4fa4ce9e167fb1816522126d36acfd3c *tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video +eb89e7d496ee7ca5cf779d5cb031bc07 *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-ilace b/tests/ref/vsynth/vsynth2-mpeg2-ilace index 565caf3..f910d57 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-ilace +++ b/tests/ref/vsynth/vsynth2-mpeg2-ilace @@ -1,4 +1,4 @@ -be3bd3d5393320419e82afaaea6c6fb6 *tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video +22cbb9cfad6335c4adb86352535fa7d1 *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd index 58feb93..3b8e94d 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd +++ b/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd @@ -1,4 +1,4 @@ -5e938746a4b50f496db6faa10cbe98d6 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video +4f2bb7129d8518bc00d15b6b134a5dfc *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-thread b/tests/ref/vsynth/vsynth2-mpeg2-thread index 9c44e9f..ec08b41 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-thread +++ b/tests/ref/vsynth/vsynth2-mpeg2-thread @@ -1,4 +1,4 @@ -722c04a6a442e0ae716e879dff4b6639 *tests/data/fate/vsynth2-mpeg2-thread.mpeg2video +0f541184f672600ecbdf465efeafb5a4 *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 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc index 6e6763e..c2cadd0 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc +++ b/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc @@ -1,4 +1,4 @@ -32abf166f7a6fdb8e4b46795a60761cc *tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video +cb2dcb206e188676941a6e737c75fdbd *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 -- 1.9.3 (Apple Git-50) _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
