From: Michael Niedermayer Date: Tue, 13 Sep 2011 03:13:34 +0000 (+0200) Subject: ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes... X-Git-Tag: android-x86-4.4-r1~16247 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f5bb35f4004791a6eb69049103a1c6382cf6542;p=android-x86%2Fexternal-ffmpeg.git ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137 Signed-off-by: Michael Niedermayer --- diff --git a/ffmpeg.c b/ffmpeg.c index 20f8db0ce3..b887abd7f5 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1220,9 +1220,18 @@ static void do_video_out(AVFormatContext *s, AVFrame *final_picture; AVCodecContext *enc; double sync_ipts; + double duration = 0; enc = ost->st->codec; + if (ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE) { + duration = FFMAX(av_q2d(ist->st->time_base), av_q2d(ist->st->codec->time_base)); + if(ist->st->avg_frame_rate.num) + duration= FFMAX(duration, 1/av_q2d(ist->st->avg_frame_rate)); + + duration /= av_q2d(enc->time_base); + } + sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base); /* by default, we output a single frame */ @@ -1235,7 +1244,7 @@ static void do_video_out(AVFormatContext *s, format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? 2 : 1; if (format_video_sync) { - double vdelta = sync_ipts - ost->sync_opts; + double vdelta = sync_ipts - ost->sync_opts + duration; //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c if (vdelta < -1.1) nb_frames = 0; diff --git a/tests/ref/fate/film-cvid-pcm-stereo-8bit b/tests/ref/fate/film-cvid-pcm-stereo-8bit index 3566b0f85a..c8d573ca33 100644 --- a/tests/ref/fate/film-cvid-pcm-stereo-8bit +++ b/tests/ref/fate/film-cvid-pcm-stereo-8bit @@ -1,124 +1,124 @@ 0, 0, 107520, 0xa6c9fdd2 1, 0, 88192, 0x23bb50ae 0, 3000, 107520, 0x61eb28c1 -0, 6000, 107520, 0x45e20af7 +0, 6000, 107520, 0x61eb28c1 0, 9000, 107520, 0x45e20af7 -0, 12000, 107520, 0x366970fc +0, 12000, 107520, 0x45e20af7 0, 15000, 107520, 0x366970fc -0, 18000, 107520, 0xa392bcb3 +0, 18000, 107520, 0x366970fc 0, 21000, 107520, 0xa392bcb3 -0, 24000, 107520, 0xcf7bac98 +0, 24000, 107520, 0xa392bcb3 0, 27000, 107520, 0xcf7bac98 -0, 30000, 107520, 0x222eba53 +0, 30000, 107520, 0xcf7bac98 0, 33000, 107520, 0x222eba53 -0, 36000, 107520, 0x74e255a1 +0, 36000, 107520, 0x222eba53 0, 39000, 107520, 0x74e255a1 -0, 42000, 107520, 0xc19eec6f +0, 42000, 107520, 0x74e255a1 1, 44996, 44112, 0x79600f01 0, 45000, 107520, 0xc19eec6f -0, 48000, 107520, 0xa3880681 +0, 48000, 107520, 0xc19eec6f 0, 51000, 107520, 0xa3880681 -0, 54000, 107520, 0x957878db +0, 54000, 107520, 0xa3880681 0, 57000, 107520, 0x957878db -0, 60000, 107520, 0x18340692 +0, 60000, 107520, 0x957878db 0, 63000, 107520, 0x18340692 -0, 66000, 107520, 0x9970f24d +0, 66000, 107520, 0x18340692 1, 67502, 44096, 0x09dbf7aa 0, 69000, 107520, 0x9970f24d -0, 72000, 107520, 0xf08618aa +0, 72000, 107520, 0x9970f24d 0, 75000, 107520, 0xf08618aa -0, 78000, 107520, 0xee7324f0 +0, 78000, 107520, 0xf08618aa 0, 81000, 107520, 0xee7324f0 -0, 84000, 107520, 0xe15025b3 +0, 84000, 107520, 0xee7324f0 0, 87000, 107520, 0xe15025b3 -0, 90000, 107520, 0x8afa312e +0, 90000, 107520, 0xe15025b3 1, 90000, 44112, 0x18fed048 0, 93000, 107520, 0x8afa312e -0, 96000, 107520, 0x717a7d0f +0, 96000, 107520, 0x8afa312e 0, 99000, 107520, 0x717a7d0f -0, 102000, 107520, 0x355c6e23 +0, 102000, 107520, 0x717a7d0f 0, 105000, 107520, 0x355c6e23 -0, 108000, 107520, 0x7015a50f +0, 108000, 107520, 0x355c6e23 0, 111000, 107520, 0x7015a50f 1, 112506, 44112, 0x030d35ef -0, 114000, 107520, 0xcdfc1a16 +0, 114000, 107520, 0x7015a50f 0, 117000, 107520, 0xcdfc1a16 -0, 120000, 107520, 0x38d929e7 +0, 120000, 107520, 0xcdfc1a16 0, 123000, 107520, 0x38d929e7 -0, 126000, 107520, 0x52913423 +0, 126000, 107520, 0x38d929e7 0, 129000, 107520, 0x52913423 -0, 132000, 107520, 0xe2c91c10 +0, 132000, 107520, 0x52913423 0, 135000, 107520, 0xe2c91c10 1, 135012, 44112, 0xc23154d5 -0, 138000, 107520, 0x85516e9c +0, 138000, 107520, 0xe2c91c10 0, 141000, 107520, 0x85516e9c -0, 144000, 107520, 0xd1626030 +0, 144000, 107520, 0x85516e9c 0, 147000, 107520, 0xd1626030 -0, 150000, 107520, 0xea7b16de +0, 150000, 107520, 0xd1626030 0, 153000, 107520, 0xea7b16de -0, 156000, 107520, 0xa33eaa0d +0, 156000, 107520, 0xea7b16de 1, 157518, 44064, 0xe4713ee7 0, 159000, 107520, 0xa33eaa0d -0, 162000, 107520, 0x8e3be6a6 +0, 162000, 107520, 0xa33eaa0d 0, 165000, 107520, 0x8e3be6a6 -0, 168000, 107520, 0x14147bd6 +0, 168000, 107520, 0x8e3be6a6 0, 171000, 107520, 0x14147bd6 -0, 174000, 107520, 0x07d54bec +0, 174000, 107520, 0x14147bd6 0, 177000, 107520, 0x07d54bec -0, 180000, 107520, 0xe287a0a7 +0, 180000, 107520, 0x07d54bec 1, 180000, 44112, 0xddc19d91 0, 183000, 107520, 0xe287a0a7 -0, 186000, 107520, 0xc023a14d +0, 186000, 107520, 0xe287a0a7 0, 189000, 107520, 0xc023a14d -0, 192000, 107520, 0x2437085d +0, 192000, 107520, 0xc023a14d 0, 195000, 107520, 0x2437085d -0, 198000, 107520, 0x63823918 +0, 198000, 107520, 0x2437085d 0, 201000, 107520, 0x63823918 1, 202506, 44112, 0x9591522d -0, 204000, 107520, 0xbc17e198 +0, 204000, 107520, 0x63823918 0, 207000, 107520, 0xbc17e198 -0, 210000, 107520, 0x9d99bc81 +0, 210000, 107520, 0xbc17e198 0, 213000, 107520, 0x9d99bc81 -0, 216000, 107520, 0x7e4ec71e +0, 216000, 107520, 0x9d99bc81 0, 219000, 107520, 0x7e4ec71e -0, 222000, 107520, 0x55b98376 +0, 222000, 107520, 0x7e4ec71e 0, 225000, 107520, 0x55b98376 1, 225012, 44112, 0x90deb013 -0, 228000, 107520, 0x356d8e9e +0, 228000, 107520, 0x55b98376 0, 231000, 107520, 0x356d8e9e -0, 234000, 107520, 0xf77e8a61 +0, 234000, 107520, 0x356d8e9e 0, 237000, 107520, 0xf77e8a61 -0, 240000, 107520, 0x5ae7c8c7 +0, 240000, 107520, 0xf77e8a61 0, 243000, 107520, 0x5ae7c8c7 -0, 246000, 107520, 0x8acf9322 +0, 246000, 107520, 0x5ae7c8c7 1, 247518, 44064, 0x3842d420 0, 249000, 107520, 0x8acf9322 -0, 252000, 107520, 0x40a9177e +0, 252000, 107520, 0x8acf9322 0, 255000, 107520, 0x40a9177e -0, 258000, 107520, 0x3e0e4d8d +0, 258000, 107520, 0x40a9177e 0, 261000, 107520, 0x3e0e4d8d -0, 264000, 107520, 0xd268865b +0, 264000, 107520, 0x3e0e4d8d 0, 267000, 107520, 0xd268865b -0, 270000, 107520, 0x89a4efeb +0, 270000, 107520, 0xd268865b 1, 270000, 44112, 0x99c8c3d9 0, 273000, 107520, 0x89a4efeb -0, 276000, 107520, 0x70ca2478 +0, 276000, 107520, 0x89a4efeb 0, 279000, 107520, 0x70ca2478 -0, 282000, 107520, 0xcc9ec981 +0, 282000, 107520, 0x70ca2478 0, 285000, 107520, 0xcc9ec981 -0, 288000, 107520, 0xf0648459 +0, 288000, 107520, 0xcc9ec981 0, 291000, 107520, 0xf0648459 1, 292506, 44112, 0xffaf3824 -0, 294000, 107520, 0x7e4a4cca +0, 294000, 107520, 0xf0648459 0, 297000, 107520, 0x7e4a4cca -0, 300000, 107520, 0xb315dc65 +0, 300000, 107520, 0x7e4a4cca 0, 303000, 107520, 0xb315dc65 -0, 306000, 107520, 0x2aecc7b4 +0, 306000, 107520, 0xb315dc65 0, 309000, 107520, 0x2aecc7b4 -0, 312000, 107520, 0x81742f51 +0, 312000, 107520, 0x2aecc7b4 0, 315000, 107520, 0x81742f51 1, 315012, 44112, 0x3dbe1aef -0, 318000, 107520, 0x3a1d7571 +0, 318000, 107520, 0x81742f51 0, 321000, 107520, 0x3a1d7571 0, 324000, 107520, 0x3a1d7571 0, 327000, 107520, 0x3a1d7571 @@ -133,53 +133,53 @@ 0, 351000, 107520, 0x3a1d7571 0, 354000, 107520, 0x3a1d7571 0, 357000, 107520, 0x3a1d7571 -0, 360000, 107520, 0xe974733e +0, 360000, 107520, 0x3a1d7571 1, 360000, 44112, 0x9e475274 0, 363000, 107520, 0xe974733e -0, 366000, 107520, 0x999c6fbf +0, 366000, 107520, 0xe974733e 0, 369000, 107520, 0x999c6fbf -0, 372000, 107520, 0x26b56b6e +0, 372000, 107520, 0x999c6fbf 0, 375000, 107520, 0x26b56b6e -0, 378000, 107520, 0xc9f9647b +0, 378000, 107520, 0x26b56b6e 0, 381000, 107520, 0xc9f9647b 1, 382506, 44112, 0x541f05d4 -0, 384000, 107520, 0x6d025d00 +0, 384000, 107520, 0xc9f9647b 0, 387000, 107520, 0x6d025d00 -0, 390000, 107520, 0xf9c056c1 +0, 390000, 107520, 0x6d025d00 0, 393000, 107520, 0xf9c056c1 -0, 396000, 107520, 0xa5cc4d0b +0, 396000, 107520, 0xf9c056c1 0, 399000, 107520, 0xa5cc4d0b -0, 402000, 107520, 0x1a4c4236 +0, 402000, 107520, 0xa5cc4d0b 0, 405000, 107520, 0x1a4c4236 1, 405012, 44112, 0x09e39025 -0, 408000, 107520, 0xa9d538b6 +0, 408000, 107520, 0x1a4c4236 0, 411000, 107520, 0xa9d538b6 -0, 414000, 107520, 0x14682d00 +0, 414000, 107520, 0xa9d538b6 0, 417000, 107520, 0x14682d00 -0, 420000, 107520, 0x6236204f +0, 420000, 107520, 0x14682d00 0, 423000, 107520, 0x6236204f -0, 426000, 107520, 0x303e14aa +0, 426000, 107520, 0x6236204f 1, 427518, 44064, 0xdc111087 0, 429000, 107520, 0x303e14aa -0, 432000, 107520, 0x943b0837 +0, 432000, 107520, 0x303e14aa 0, 435000, 107520, 0x943b0837 -0, 438000, 107520, 0xfce5fd07 +0, 438000, 107520, 0x943b0837 0, 441000, 107520, 0xfce5fd07 -0, 444000, 107520, 0xd993f193 +0, 444000, 107520, 0xfce5fd07 0, 447000, 107520, 0xd993f193 -0, 450000, 107520, 0x4d48e7b4 +0, 450000, 107520, 0xd993f193 1, 450000, 44112, 0xb8f86e48 0, 453000, 107520, 0x4d48e7b4 -0, 456000, 107520, 0x61ccdf83 +0, 456000, 107520, 0x4d48e7b4 0, 459000, 107520, 0x61ccdf83 -0, 462000, 107520, 0xfb4fd608 +0, 462000, 107520, 0x61ccdf83 0, 465000, 107520, 0xfb4fd608 -0, 468000, 107520, 0x5efdcdb3 +0, 468000, 107520, 0xfb4fd608 0, 471000, 107520, 0x5efdcdb3 1, 472506, 44112, 0xa1e0c75c -0, 474000, 107520, 0xb03ec886 +0, 474000, 107520, 0x5efdcdb3 0, 477000, 107520, 0xb03ec886 -0, 480000, 107520, 0xf464c343 +0, 480000, 107520, 0xb03ec886 0, 483000, 107520, 0xf464c343 0, 486000, 107520, 0xf464c343 0, 489000, 107520, 0xf464c343 @@ -204,7 +204,7 @@ 0, 540000, 107520, 0xf464c343 1, 540000, 44112, 0xe0ac619f 0, 543000, 107520, 0xf464c343 -0, 546000, 107520, 0xf2b2c712 +0, 546000, 107520, 0xf464c343 0, 549000, 107520, 0xf2b2c712 0, 552000, 107520, 0xf2b2c712 0, 555000, 107520, 0xf2b2c712 @@ -213,35 +213,36 @@ 1, 562506, 44112, 0xb07aa65c 0, 564000, 107520, 0xf2b2c712 0, 567000, 107520, 0xf2b2c712 -0, 570000, 107520, 0xb95e6bc8 +0, 570000, 107520, 0xf2b2c712 0, 573000, 107520, 0xb95e6bc8 -0, 576000, 107520, 0x33feee37 +0, 576000, 107520, 0xb95e6bc8 0, 579000, 107520, 0x33feee37 -0, 582000, 107520, 0x36ee3cd5 +0, 582000, 107520, 0x33feee37 0, 585000, 107520, 0x36ee3cd5 1, 585012, 44112, 0x24610ff0 -0, 588000, 107520, 0x59096471 +0, 588000, 107520, 0x36ee3cd5 0, 591000, 107520, 0x59096471 -0, 594000, 107520, 0x53b470c6 +0, 594000, 107520, 0x59096471 0, 597000, 107520, 0x53b470c6 -0, 600000, 107520, 0xdb7c64ff +0, 600000, 107520, 0x53b470c6 0, 603000, 107520, 0xdb7c64ff -0, 606000, 107520, 0xe5a1596a +0, 606000, 107520, 0xdb7c64ff 1, 607518, 44064, 0x00000000 0, 609000, 107520, 0xe5a1596a -0, 612000, 107520, 0x8c8942eb +0, 612000, 107520, 0xe5a1596a 0, 615000, 107520, 0x8c8942eb -0, 618000, 107520, 0x5ecc379e +0, 618000, 107520, 0x8c8942eb 0, 621000, 107520, 0x5ecc379e -0, 624000, 107520, 0xea09432a +0, 624000, 107520, 0x5ecc379e 0, 627000, 107520, 0xea09432a -0, 630000, 107520, 0xe01e6b73 +0, 630000, 107520, 0xea09432a 1, 630000, 44112, 0x00000000 0, 633000, 107520, 0xe01e6b73 -0, 636000, 107520, 0x1d13bba8 +0, 636000, 107520, 0xe01e6b73 0, 639000, 107520, 0x1d13bba8 -0, 642000, 107520, 0x3a993a6c +0, 642000, 107520, 0x1d13bba8 0, 645000, 107520, 0x3a993a6c -0, 648000, 107520, 0x2ede041a +0, 648000, 107520, 0x3a993a6c 0, 651000, 107520, 0x2ede041a 1, 652506, 8800, 0x00000000 +0, 654000, 107520, 0x2ede041a diff --git a/tests/ref/fate/mpeg2-field-enc b/tests/ref/fate/mpeg2-field-enc index 1ea05bd9b7..c8ee4cfba0 100644 --- a/tests/ref/fate/mpeg2-field-enc +++ b/tests/ref/fate/mpeg2-field-enc @@ -7,33 +7,34 @@ 0, 21600, 622080, 0xb3b66c5c 0, 25200, 622080, 0xb3b66c5c 0, 28800, 622080, 0xb3b66c5c -0, 32400, 622080, 0x088ec02b -0, 36000, 622080, 0x7a36db21 -0, 39600, 622080, 0x541b286f -0, 43200, 622080, 0xb6c3e590 -0, 46800, 622080, 0x39dbed51 -0, 50400, 622080, 0x973dc728 -0, 54000, 622080, 0xd7a4f804 -0, 57600, 622080, 0xa2484762 -0, 61200, 622080, 0x0cd268d1 -0, 64800, 622080, 0x72eb663d -0, 68400, 622080, 0x8fdbac59 -0, 72000, 622080, 0xa6f4feb9 -0, 75600, 622080, 0xadb828c6 -0, 79200, 622080, 0xea630a63 -0, 82800, 622080, 0xa901d925 -0, 86400, 622080, 0xac5e7087 -0, 90000, 622080, 0x10274a2b -0, 93600, 622080, 0x143d541c -0, 97200, 622080, 0xee94c93a -0, 100800, 622080, 0xca030208 -0, 104400, 622080, 0x26f30ead -0, 108000, 622080, 0xfc22f32c -0, 111600, 622080, 0x940a5ff8 -0, 115200, 622080, 0x2164f805 -0, 118800, 622080, 0xa76f5aba -0, 122400, 622080, 0x8c311471 -0, 126000, 622080, 0xa45e1d95 -0, 129600, 622080, 0x6cc61d6c -0, 133200, 622080, 0x6983b417 -0, 136800, 622080, 0x982363c0 +0, 32400, 622080, 0xb3b66c5c +0, 36000, 622080, 0x088ec02b +0, 39600, 622080, 0x7a36db21 +0, 43200, 622080, 0x541b286f +0, 46800, 622080, 0xb6c3e590 +0, 50400, 622080, 0x39dbed51 +0, 54000, 622080, 0x973dc728 +0, 57600, 622080, 0xd7a4f804 +0, 61200, 622080, 0xa2484762 +0, 64800, 622080, 0x0cd268d1 +0, 68400, 622080, 0x72eb663d +0, 72000, 622080, 0x8fdbac59 +0, 75600, 622080, 0xa6f4feb9 +0, 79200, 622080, 0xadb828c6 +0, 82800, 622080, 0xea630a63 +0, 86400, 622080, 0xa901d925 +0, 90000, 622080, 0xac5e7087 +0, 93600, 622080, 0x10274a2b +0, 97200, 622080, 0x143d541c +0, 100800, 622080, 0xee94c93a +0, 104400, 622080, 0xca030208 +0, 108000, 622080, 0x26f30ead +0, 111600, 622080, 0xfc22f32c +0, 115200, 622080, 0x940a5ff8 +0, 118800, 622080, 0x2164f805 +0, 122400, 622080, 0xa76f5aba +0, 126000, 622080, 0x8c311471 +0, 129600, 622080, 0xa45e1d95 +0, 133200, 622080, 0x6cc61d6c +0, 136800, 622080, 0x6983b417 +0, 140400, 622080, 0x982363c0 diff --git a/tests/ref/fate/quickdraw b/tests/ref/fate/quickdraw index 5d6303b70d..71612122a1 100644 --- a/tests/ref/fate/quickdraw +++ b/tests/ref/fate/quickdraw @@ -1,2 +1,3 @@ 0, 0, 921600, 0xc0e68764 0, 6000, 921600, 0x01a16629 +0, 12000, 921600, 0x01a16629 diff --git a/tests/ref/fate/tiertex-seq b/tests/ref/fate/tiertex-seq index 6aa7fc7b9f..a75de4a76e 100644 --- a/tests/ref/fate/tiertex-seq +++ b/tests/ref/fate/tiertex-seq @@ -6,13 +6,13 @@ 1, 7200, 1764, 0x95a16721 0, 10800, 98304, 0xb20c19d0 1, 10800, 1764, 0x0f0d4cb6 -0, 14400, 98304, 0x6b8538c0 +0, 14400, 98304, 0xb20c19d0 1, 14400, 1764, 0x75026779 0, 18000, 98304, 0x6b8538c0 1, 18000, 1764, 0xb4356e37 0, 21600, 98304, 0x6b8538c0 1, 21600, 1764, 0xfafa64cb -0, 25200, 98304, 0x172207e3 +0, 25200, 98304, 0x6b8538c0 1, 25200, 1764, 0xe8fd7970 0, 28800, 98304, 0x172207e3 1, 28800, 1764, 0x666879b7 @@ -20,13 +20,13 @@ 1, 32400, 1764, 0xf2cd7770 0, 36000, 98304, 0x172207e3 1, 36000, 1764, 0x54317a1c -0, 39600, 98304, 0x63fb7dc1 +0, 39600, 98304, 0x172207e3 1, 39600, 1764, 0x9c396930 0, 43200, 98304, 0x63fb7dc1 1, 43200, 1764, 0x87115ec4 0, 46800, 98304, 0x63fb7dc1 1, 46800, 1764, 0x0c9b69b6 -0, 50400, 98304, 0x37cf1601 +0, 50400, 98304, 0x63fb7dc1 1, 50400, 1764, 0x8c3a758a 0, 54000, 98304, 0x37cf1601 1, 54000, 1764, 0x605d776a @@ -34,7 +34,7 @@ 1, 57600, 1764, 0x0556852d 0, 61200, 98304, 0x37cf1601 1, 61200, 1764, 0x7d4363f8 -0, 64800, 98304, 0x82941990 +0, 64800, 98304, 0x37cf1601 1, 64800, 1764, 0xc5cd75d0 0, 68400, 98304, 0x82941990 1, 68400, 1764, 0x3ff3646d @@ -42,13 +42,13 @@ 1, 72000, 1764, 0x10136d25 0, 75600, 98304, 0x82941990 1, 75600, 1764, 0xeb1a6cd0 -0, 79200, 98304, 0xe0a5309e +0, 79200, 98304, 0x82941990 1, 79200, 1764, 0xef937ed1 0, 82800, 98304, 0xe0a5309e 1, 82800, 1764, 0x2d2b6f79 0, 86400, 98304, 0xe0a5309e 1, 86400, 1764, 0x6f457231 -0, 90000, 98304, 0x164cb67d +0, 90000, 98304, 0xe0a5309e 1, 90000, 1764, 0x56267c9d 0, 93600, 98304, 0x164cb67d 1, 93600, 1764, 0xd49e79c8 @@ -56,13 +56,13 @@ 1, 97200, 1764, 0xc726703d 0, 100800, 98304, 0x164cb67d 1, 100800, 1764, 0x2abf8074 -0, 104400, 98304, 0xed2189f8 +0, 104400, 98304, 0x164cb67d 1, 104400, 1764, 0xb50c556d 0, 108000, 98304, 0xed2189f8 1, 108000, 1764, 0xc1f2523c 0, 111600, 98304, 0xed2189f8 1, 111600, 1764, 0x850a6f93 -0, 115200, 98304, 0x7215e529 +0, 115200, 98304, 0xed2189f8 1, 115200, 1764, 0x8da76c31 0, 118800, 98304, 0x7215e529 1, 118800, 1764, 0xfcccdf13 @@ -70,13 +70,13 @@ 1, 122400, 1764, 0x00000000 0, 126000, 98304, 0x7215e529 1, 126000, 1764, 0x00000000 -0, 129600, 98304, 0x170c783b +0, 129600, 98304, 0x7215e529 1, 129600, 1764, 0x00000000 0, 133200, 98304, 0x170c783b 1, 133200, 1764, 0x00000000 0, 136800, 98304, 0x170c783b 1, 136800, 1764, 0x00000000 -0, 140400, 98304, 0xf6bd74c7 +0, 140400, 98304, 0x170c783b 1, 140400, 1764, 0x00000000 0, 144000, 98304, 0xf6bd74c7 1, 144000, 1764, 0x00000000 @@ -84,7 +84,7 @@ 1, 147600, 1764, 0x00000000 0, 151200, 98304, 0xf6bd74c7 1, 151200, 1764, 0x00000000 -0, 154800, 98304, 0x1efd38c4 +0, 154800, 98304, 0xf6bd74c7 1, 154800, 1764, 0x00000000 0, 158400, 98304, 0x1efd38c4 1, 158400, 1764, 0x00000000 @@ -92,13 +92,13 @@ 1, 162000, 1764, 0x00000000 0, 165600, 98304, 0x1efd38c4 1, 165600, 1764, 0x00000000 -0, 169200, 98304, 0x29c26bba +0, 169200, 98304, 0x1efd38c4 1, 169200, 1764, 0x00000000 0, 172800, 98304, 0x29c26bba 1, 172800, 1764, 0x00000000 0, 176400, 98304, 0x29c26bba 1, 176400, 1764, 0x00000000 -0, 180000, 98304, 0x880a6313 +0, 180000, 98304, 0x29c26bba 1, 180000, 1764, 0x00000000 0, 183600, 98304, 0x880a6313 1, 183600, 1764, 0x00000000 @@ -106,13 +106,13 @@ 1, 187200, 1764, 0x00000000 0, 190800, 98304, 0x880a6313 1, 190800, 1764, 0x00000000 -0, 194400, 98304, 0x73f5bb00 +0, 194400, 98304, 0x880a6313 1, 194400, 1764, 0x00000000 0, 198000, 98304, 0x73f5bb00 1, 198000, 1764, 0x00000000 0, 201600, 98304, 0x73f5bb00 1, 201600, 1764, 0x00000000 -0, 205200, 98304, 0xc85b19ec +0, 205200, 98304, 0x73f5bb00 1, 205200, 1764, 0x00000000 0, 208800, 98304, 0xc85b19ec 1, 208800, 1764, 0x00000000 @@ -120,7 +120,7 @@ 1, 212400, 1764, 0x00000000 0, 216000, 98304, 0xc85b19ec 1, 216000, 1764, 0x00000000 -0, 219600, 98304, 0x00000000 +0, 219600, 98304, 0xc85b19ec 1, 219600, 1764, 0x00000000 0, 223200, 98304, 0x00000000 1, 223200, 1764, 0x00000000 @@ -142,6 +142,7 @@ 1, 252000, 1764, 0x00000000 0, 255600, 98304, 0x00000000 1, 255600, 1764, 0x00000000 +0, 259200, 98304, 0x00000000 1, 259200, 1764, 0x00000000 1, 262800, 1764, 0x00000000 1, 266400, 1764, 0x00000000 diff --git a/tests/ref/fate/tscc-32bit b/tests/ref/fate/tscc-32bit index dd888a85f2..b014471c14 100644 --- a/tests/ref/fate/tscc-32bit +++ b/tests/ref/fate/tscc-32bit @@ -11,73 +11,73 @@ 0, 60000, 2359296, 0xda3ba3cf 0, 66000, 2359296, 0xda3ba3cf 0, 72000, 2359296, 0xda3ba3cf -0, 78000, 2359296, 0x60a070fd -0, 84000, 2359296, 0x42e5fedc +0, 78000, 2359296, 0xda3ba3cf +0, 84000, 2359296, 0x60a070fd 0, 90000, 2359296, 0x42e5fedc -0, 96000, 2359296, 0x699cf990 +0, 96000, 2359296, 0x42e5fedc 0, 102000, 2359296, 0x699cf990 0, 108000, 2359296, 0x699cf990 0, 114000, 2359296, 0x699cf990 0, 120000, 2359296, 0x699cf990 0, 126000, 2359296, 0x699cf990 0, 132000, 2359296, 0x699cf990 -0, 138000, 2359296, 0x1524160c +0, 138000, 2359296, 0x699cf990 0, 144000, 2359296, 0x1524160c 0, 150000, 2359296, 0x1524160c 0, 156000, 2359296, 0x1524160c 0, 162000, 2359296, 0x1524160c 0, 168000, 2359296, 0x1524160c 0, 174000, 2359296, 0x1524160c -0, 180000, 2359296, 0x33df0c8c +0, 180000, 2359296, 0x1524160c 0, 186000, 2359296, 0x33df0c8c 0, 192000, 2359296, 0x33df0c8c 0, 198000, 2359296, 0x33df0c8c 0, 204000, 2359296, 0x33df0c8c 0, 210000, 2359296, 0x33df0c8c 0, 216000, 2359296, 0x33df0c8c -0, 222000, 2359296, 0xfe3d29f8 +0, 222000, 2359296, 0x33df0c8c 0, 228000, 2359296, 0xfe3d29f8 0, 234000, 2359296, 0xfe3d29f8 0, 240000, 2359296, 0xfe3d29f8 0, 246000, 2359296, 0xfe3d29f8 0, 252000, 2359296, 0xfe3d29f8 0, 258000, 2359296, 0xfe3d29f8 -0, 264000, 2359296, 0x1b9d197f +0, 264000, 2359296, 0xfe3d29f8 0, 270000, 2359296, 0x1b9d197f 0, 276000, 2359296, 0x1b9d197f 0, 282000, 2359296, 0x1b9d197f 0, 288000, 2359296, 0x1b9d197f 0, 294000, 2359296, 0x1b9d197f 0, 300000, 2359296, 0x1b9d197f -0, 306000, 2359296, 0x48c126fb +0, 306000, 2359296, 0x1b9d197f 0, 312000, 2359296, 0x48c126fb 0, 318000, 2359296, 0x48c126fb 0, 324000, 2359296, 0x48c126fb 0, 330000, 2359296, 0x48c126fb 0, 336000, 2359296, 0x48c126fb 0, 342000, 2359296, 0x48c126fb -0, 348000, 2359296, 0xcaa31c7c +0, 348000, 2359296, 0x48c126fb 0, 354000, 2359296, 0xcaa31c7c 0, 360000, 2359296, 0xcaa31c7c 0, 366000, 2359296, 0xcaa31c7c 0, 372000, 2359296, 0xcaa31c7c 0, 378000, 2359296, 0xcaa31c7c 0, 384000, 2359296, 0xcaa31c7c -0, 390000, 2359296, 0xc6a333ee +0, 390000, 2359296, 0xcaa31c7c 0, 396000, 2359296, 0xc6a333ee 0, 402000, 2359296, 0xc6a333ee 0, 408000, 2359296, 0xc6a333ee 0, 414000, 2359296, 0xc6a333ee 0, 420000, 2359296, 0xc6a333ee 0, 426000, 2359296, 0xc6a333ee -0, 432000, 2359296, 0xb96d1583 +0, 432000, 2359296, 0xc6a333ee 0, 438000, 2359296, 0xb96d1583 0, 444000, 2359296, 0xb96d1583 0, 450000, 2359296, 0xb96d1583 0, 456000, 2359296, 0xb96d1583 0, 462000, 2359296, 0xb96d1583 0, 468000, 2359296, 0xb96d1583 -0, 474000, 2359296, 0x878135ec +0, 474000, 2359296, 0xb96d1583 0, 480000, 2359296, 0x878135ec 0, 486000, 2359296, 0x878135ec 0, 492000, 2359296, 0x878135ec @@ -85,75 +85,76 @@ 0, 504000, 2359296, 0x878135ec 0, 510000, 2359296, 0x878135ec 0, 516000, 2359296, 0x878135ec -0, 522000, 2359296, 0x76922870 +0, 522000, 2359296, 0x878135ec 0, 528000, 2359296, 0x76922870 0, 534000, 2359296, 0x76922870 0, 540000, 2359296, 0x76922870 0, 546000, 2359296, 0x76922870 0, 552000, 2359296, 0x76922870 0, 558000, 2359296, 0x76922870 -0, 564000, 2359296, 0xb0e031f0 +0, 564000, 2359296, 0x76922870 0, 570000, 2359296, 0xb0e031f0 0, 576000, 2359296, 0xb0e031f0 0, 582000, 2359296, 0xb0e031f0 0, 588000, 2359296, 0xb0e031f0 0, 594000, 2359296, 0xb0e031f0 0, 600000, 2359296, 0xb0e031f0 -0, 606000, 2359296, 0xb2ef2a6e +0, 606000, 2359296, 0xb0e031f0 0, 612000, 2359296, 0xb2ef2a6e 0, 618000, 2359296, 0xb2ef2a6e -0, 624000, 2359296, 0x083c2474 +0, 624000, 2359296, 0xb2ef2a6e 0, 630000, 2359296, 0x083c2474 0, 636000, 2359296, 0x083c2474 0, 642000, 2359296, 0x083c2474 -0, 648000, 2359296, 0xbdfe2ef3 +0, 648000, 2359296, 0x083c2474 0, 654000, 2359296, 0xbdfe2ef3 0, 660000, 2359296, 0xbdfe2ef3 0, 666000, 2359296, 0xbdfe2ef3 0, 672000, 2359296, 0xbdfe2ef3 0, 678000, 2359296, 0xbdfe2ef3 0, 684000, 2359296, 0xbdfe2ef3 -0, 690000, 2359296, 0x934b1484 +0, 690000, 2359296, 0xbdfe2ef3 0, 696000, 2359296, 0x934b1484 0, 702000, 2359296, 0x934b1484 0, 708000, 2359296, 0x934b1484 -0, 714000, 2359296, 0x3e0d1a7e +0, 714000, 2359296, 0x934b1484 0, 720000, 2359296, 0x3e0d1a7e 0, 726000, 2359296, 0x3e0d1a7e -0, 732000, 2359296, 0x3ce539e8 +0, 732000, 2359296, 0x3e0d1a7e 0, 738000, 2359296, 0x3ce539e8 0, 744000, 2359296, 0x3ce539e8 0, 750000, 2359296, 0x3ce539e8 0, 756000, 2359296, 0x3ce539e8 0, 762000, 2359296, 0x3ce539e8 0, 768000, 2359296, 0x3ce539e8 -0, 774000, 2359296, 0xd46c2f69 +0, 774000, 2359296, 0x3ce539e8 0, 780000, 2359296, 0xd46c2f69 0, 786000, 2359296, 0xd46c2f69 0, 792000, 2359296, 0xd46c2f69 0, 798000, 2359296, 0xd46c2f69 0, 804000, 2359296, 0xd46c2f69 0, 810000, 2359296, 0xd46c2f69 -0, 816000, 2359296, 0x8d2933ee +0, 816000, 2359296, 0xd46c2f69 0, 822000, 2359296, 0x8d2933ee 0, 828000, 2359296, 0x8d2933ee 0, 834000, 2359296, 0x8d2933ee 0, 840000, 2359296, 0x8d2933ee 0, 846000, 2359296, 0x8d2933ee 0, 852000, 2359296, 0x8d2933ee -0, 858000, 2359296, 0xb6092b6d +0, 858000, 2359296, 0x8d2933ee 0, 864000, 2359296, 0xb6092b6d 0, 870000, 2359296, 0xb6092b6d 0, 876000, 2359296, 0xb6092b6d 0, 882000, 2359296, 0xb6092b6d 0, 888000, 2359296, 0xb6092b6d 0, 894000, 2359296, 0xb6092b6d -0, 900000, 2359296, 0xe4ef27fa +0, 900000, 2359296, 0xb6092b6d 0, 906000, 2359296, 0xe4ef27fa 0, 912000, 2359296, 0xe4ef27fa 0, 918000, 2359296, 0xe4ef27fa 0, 924000, 2359296, 0xe4ef27fa 0, 930000, 2359296, 0xe4ef27fa 0, 936000, 2359296, 0xe4ef27fa -0, 942000, 2359296, 0x5e5b2672 +0, 942000, 2359296, 0xe4ef27fa 0, 948000, 2359296, 0x5e5b2672 +0, 954000, 2359296, 0x5e5b2672 diff --git a/tests/ref/fate/vmnc-32bit b/tests/ref/fate/vmnc-32bit index fa3d6a07aa..4486ff92e5 100644 --- a/tests/ref/fate/vmnc-32bit +++ b/tests/ref/fate/vmnc-32bit @@ -3,28 +3,28 @@ 0, 36000, 3655644, 0x3c3167fd 0, 54000, 3655644, 0x87973530 0, 72000, 3655644, 0x87973530 -0, 90000, 3655644, 0x3c3167fd +0, 90000, 3655644, 0x87973530 0, 108000, 3655644, 0x3c3167fd -0, 126000, 3655644, 0x87973530 +0, 126000, 3655644, 0x3c3167fd 0, 144000, 3655644, 0x87973530 0, 162000, 3655644, 0x87973530 0, 180000, 3655644, 0x87973530 -0, 198000, 3655644, 0x3c3167fd -0, 216000, 3655644, 0x87973530 +0, 198000, 3655644, 0x87973530 +0, 216000, 3655644, 0x3c3167fd 0, 234000, 3655644, 0x87973530 0, 252000, 3655644, 0x87973530 -0, 270000, 3655644, 0x4f0da763 +0, 270000, 3655644, 0x87973530 0, 288000, 3655644, 0x4f0da763 0, 306000, 3655644, 0x4f0da763 -0, 324000, 3655644, 0x66a4a763 -0, 342000, 3655644, 0xb20a7496 -0, 360000, 3655644, 0x66a4a763 +0, 324000, 3655644, 0x4f0da763 +0, 342000, 3655644, 0x66a4a763 +0, 360000, 3655644, 0xb20a7496 0, 378000, 3655644, 0x66a4a763 0, 396000, 3655644, 0x66a4a763 -0, 414000, 3655644, 0x5600644a -0, 432000, 3655644, 0xce5880ee +0, 414000, 3655644, 0x66a4a763 +0, 432000, 3655644, 0x5600644a 0, 450000, 3655644, 0xce5880ee -0, 468000, 3655644, 0xa993ef3d +0, 468000, 3655644, 0xce5880ee 0, 486000, 3655644, 0xa993ef3d 0, 504000, 3655644, 0xa993ef3d 0, 522000, 3655644, 0xa993ef3d @@ -47,7 +47,7 @@ 0, 828000, 3655644, 0xa993ef3d 0, 846000, 3655644, 0xa993ef3d 0, 864000, 3655644, 0xa993ef3d -0, 882000, 3655644, 0x73564014 +0, 882000, 3655644, 0xa993ef3d 0, 900000, 3655644, 0x73564014 0, 918000, 3655644, 0x73564014 0, 936000, 3655644, 0x73564014 @@ -59,95 +59,95 @@ 0, 1044000, 3655644, 0x73564014 0, 1062000, 3655644, 0x73564014 0, 1080000, 3655644, 0x73564014 -0, 1098000, 3655644, 0x2a6e1e8c +0, 1098000, 3655644, 0x73564014 0, 1116000, 3655644, 0x2a6e1e8c 0, 1134000, 3655644, 0x2a6e1e8c -0, 1152000, 3655644, 0xbae02e7c +0, 1152000, 3655644, 0x2a6e1e8c 0, 1170000, 3655644, 0xbae02e7c 0, 1188000, 3655644, 0xbae02e7c 0, 1206000, 3655644, 0xbae02e7c -0, 1224000, 3655644, 0x55af4a2d +0, 1224000, 3655644, 0xbae02e7c 0, 1242000, 3655644, 0x55af4a2d 0, 1260000, 3655644, 0x55af4a2d 0, 1278000, 3655644, 0x55af4a2d -0, 1296000, 3655644, 0x54b7ff2d -0, 1314000, 3655644, 0x39af1aed +0, 1296000, 3655644, 0x55af4a2d +0, 1314000, 3655644, 0x54b7ff2d 0, 1332000, 3655644, 0x39af1aed 0, 1350000, 3655644, 0x39af1aed 0, 1368000, 3655644, 0x39af1aed -0, 1386000, 3655644, 0xe48dd11c +0, 1386000, 3655644, 0x39af1aed 0, 1404000, 3655644, 0xe48dd11c 0, 1422000, 3655644, 0xe48dd11c 0, 1440000, 3655644, 0xe48dd11c 0, 1458000, 3655644, 0xe48dd11c -0, 1476000, 3655644, 0xba15c78d +0, 1476000, 3655644, 0xe48dd11c 0, 1494000, 3655644, 0xba15c78d 0, 1512000, 3655644, 0xba15c78d 0, 1530000, 3655644, 0xba15c78d 0, 1548000, 3655644, 0xba15c78d 0, 1566000, 3655644, 0xba15c78d 0, 1584000, 3655644, 0xba15c78d -0, 1602000, 3655644, 0x39af1aed +0, 1602000, 3655644, 0xba15c78d 0, 1620000, 3655644, 0x39af1aed 0, 1638000, 3655644, 0x39af1aed 0, 1656000, 3655644, 0x39af1aed 0, 1674000, 3655644, 0x39af1aed 0, 1692000, 3655644, 0x39af1aed 0, 1710000, 3655644, 0x39af1aed -0, 1728000, 3655644, 0x27f96cd8 +0, 1728000, 3655644, 0x39af1aed 0, 1746000, 3655644, 0x27f96cd8 0, 1764000, 3655644, 0x27f96cd8 0, 1782000, 3655644, 0x27f96cd8 0, 1800000, 3655644, 0x27f96cd8 0, 1818000, 3655644, 0x27f96cd8 0, 1836000, 3655644, 0x27f96cd8 -0, 1854000, 3655644, 0xf4f068dc +0, 1854000, 3655644, 0x27f96cd8 0, 1872000, 3655644, 0xf4f068dc 0, 1890000, 3655644, 0xf4f068dc 0, 1908000, 3655644, 0xf4f068dc 0, 1926000, 3655644, 0xf4f068dc 0, 1944000, 3655644, 0xf4f068dc 0, 1962000, 3655644, 0xf4f068dc -0, 1980000, 3655644, 0xf1c55cf5 -0, 1998000, 3655644, 0xd932633d +0, 1980000, 3655644, 0xf4f068dc +0, 1998000, 3655644, 0xf1c55cf5 0, 2016000, 3655644, 0xd932633d -0, 2034000, 3655644, 0xc6e95e0a -0, 2052000, 3655644, 0x9a63c9de -0, 2070000, 3655644, 0xf166ad4f -0, 2088000, 3655644, 0xe9eeba41 -0, 2106000, 3655644, 0x7e598ad7 -0, 2124000, 3655644, 0xf3bd257e +0, 2034000, 3655644, 0xd932633d +0, 2052000, 3655644, 0xc6e95e0a +0, 2070000, 3655644, 0x9a63c9de +0, 2088000, 3655644, 0xf166ad4f +0, 2106000, 3655644, 0xe9eeba41 +0, 2124000, 3655644, 0x7e598ad7 0, 2142000, 3655644, 0xf3bd257e 0, 2160000, 3655644, 0xf3bd257e 0, 2178000, 3655644, 0xf3bd257e 0, 2196000, 3655644, 0xf3bd257e -0, 2214000, 3655644, 0xf35b3852 +0, 2214000, 3655644, 0xf3bd257e 0, 2232000, 3655644, 0xf35b3852 0, 2250000, 3655644, 0xf35b3852 0, 2268000, 3655644, 0xf35b3852 -0, 2286000, 3655644, 0x9d553959 -0, 2304000, 3655644, 0x0a9de8e2 -0, 2322000, 3655644, 0xf2325b6c +0, 2286000, 3655644, 0xf35b3852 +0, 2304000, 3655644, 0x9d553959 +0, 2322000, 3655644, 0x0a9de8e2 0, 2340000, 3655644, 0xf2325b6c 0, 2358000, 3655644, 0xf2325b6c 0, 2376000, 3655644, 0xf2325b6c 0, 2394000, 3655644, 0xf2325b6c 0, 2412000, 3655644, 0xf2325b6c -0, 2430000, 3655644, 0xcf924028 +0, 2430000, 3655644, 0xf2325b6c 0, 2448000, 3655644, 0xcf924028 -0, 2466000, 3655644, 0x8dae55bc +0, 2466000, 3655644, 0xcf924028 0, 2484000, 3655644, 0x8dae55bc -0, 2502000, 3655644, 0x57b08ced +0, 2502000, 3655644, 0x8dae55bc 0, 2520000, 3655644, 0x57b08ced -0, 2538000, 3655644, 0xef89a1d8 +0, 2538000, 3655644, 0x57b08ced 0, 2556000, 3655644, 0xef89a1d8 -0, 2574000, 3655644, 0x69e5503a +0, 2574000, 3655644, 0xef89a1d8 0, 2592000, 3655644, 0x69e5503a -0, 2610000, 3655644, 0xc3de7b3f +0, 2610000, 3655644, 0x69e5503a 0, 2628000, 3655644, 0xc3de7b3f -0, 2646000, 3655644, 0x88eea64a +0, 2646000, 3655644, 0xc3de7b3f 0, 2664000, 3655644, 0x88eea64a -0, 2682000, 3655644, 0xe39cce1f +0, 2682000, 3655644, 0x88eea64a 0, 2700000, 3655644, 0xe39cce1f 0, 2718000, 3655644, 0xe39cce1f 0, 2736000, 3655644, 0xe39cce1f @@ -160,12 +160,13 @@ 0, 2862000, 3655644, 0xe39cce1f 0, 2880000, 3655644, 0xe39cce1f 0, 2898000, 3655644, 0xe39cce1f -0, 2916000, 3655644, 0xf0ed0d04 +0, 2916000, 3655644, 0xe39cce1f 0, 2934000, 3655644, 0xf0ed0d04 0, 2952000, 3655644, 0xf0ed0d04 0, 2970000, 3655644, 0xf0ed0d04 -0, 2988000, 3655644, 0x32490d3e +0, 2988000, 3655644, 0xf0ed0d04 0, 3006000, 3655644, 0x32490d3e 0, 3024000, 3655644, 0x32490d3e 0, 3042000, 3655644, 0x32490d3e 0, 3060000, 3655644, 0x32490d3e +0, 3078000, 3655644, 0x32490d3e diff --git a/tests/ref/fate/vp8-sign-bias b/tests/ref/fate/vp8-sign-bias index 4e4f6c4b2d..db007b5385 100644 --- a/tests/ref/fate/vp8-sign-bias +++ b/tests/ref/fate/vp8-sign-bias @@ -1,9 +1,10 @@ 0, 0, 614880, 12ce23b288485be3ddbc1db28c21517f 0, 3750, 614880, ce352e1079535ea058c0e9ad50f7cdb8 -0, 7500, 614880, 9f6bf2739a027dfd12c81586cf75d3a3 -0, 11250, 614880, 7593a85ab7790eb39d65fc53f769ed8b -0, 15000, 614880, 52f47f1e0348f3297d9f233fb5405e8b -0, 18750, 614880, cd51d2c200bfd66e8e1b0fd6b404570f -0, 22500, 614880, cf535cf0a53e903cd98a9a944b72da6d -0, 26250, 614880, 1b270fd2b56daa7892102c2885d23201 -0, 30000, 614880, ff373c0c8a4a319c84e72b1c3d76b399 +0, 7500, 614880, ce352e1079535ea058c0e9ad50f7cdb8 +0, 11250, 614880, 9f6bf2739a027dfd12c81586cf75d3a3 +0, 15000, 614880, 7593a85ab7790eb39d65fc53f769ed8b +0, 18750, 614880, 52f47f1e0348f3297d9f233fb5405e8b +0, 22500, 614880, cd51d2c200bfd66e8e1b0fd6b404570f +0, 26250, 614880, cf535cf0a53e903cd98a9a944b72da6d +0, 30000, 614880, 1b270fd2b56daa7892102c2885d23201 +0, 33750, 614880, ff373c0c8a4a319c84e72b1c3d76b399 diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index 6b39c2f273..68bc9785a2 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,3 +1,3 @@ 346d38d330ab5cb0caa6b5537167bc0d *./tests/data/lavf/lavf.gxf 796392 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x345f86eb +./tests/data/lavf/lavf.gxf CRC=0x102918fd