From b02493e47668e66757b72a7163476e590edfea3a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 4 Oct 2012 00:51:44 +0200 Subject: [PATCH] movenc: force video timebase to be 0.1ms precisse at least. The timebases before where only guranteed to be 1/fps precisse and could cause AV sync errors on low fps Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 2 ++ tests/ref/fate/vsynth1-avui | 2 +- tests/ref/fate/vsynth1-dnxhd-1080i | 2 +- tests/ref/fate/vsynth1-mpeg4 | 2 +- tests/ref/fate/vsynth1-prores | 2 +- tests/ref/fate/vsynth1-prores_kostya | 2 +- tests/ref/fate/vsynth1-qtrle | 2 +- tests/ref/fate/vsynth1-qtrlegray | 2 +- tests/ref/fate/vsynth1-svq1 | 2 +- tests/ref/fate/vsynth2-avui | 2 +- tests/ref/fate/vsynth2-dnxhd-1080i | 2 +- tests/ref/fate/vsynth2-mpeg4 | 2 +- tests/ref/fate/vsynth2-prores | 2 +- tests/ref/fate/vsynth2-prores_kostya | 2 +- tests/ref/fate/vsynth2-qtrle | 2 +- tests/ref/fate/vsynth2-qtrlegray | 2 +- tests/ref/fate/vsynth2-svq1 | 2 +- tests/ref/lavf/mov | 6 +++--- tests/ref/seek/dnxhd_1080i_mov | 24 ++++++++++++------------ tests/ref/seek/lavf_mov | 16 ++++++++-------- tests/ref/seek/mpeg4_mp4 | 24 ++++++++++++------------ tests/ref/seek/svq1_mov | 24 ++++++++++++------------ 22 files changed, 65 insertions(+), 63 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6de5306c0b..1a618498e6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3522,6 +3522,8 @@ static int mov_write_header(AVFormatContext *s) track->height = track->tag>>24 == 'n' ? 486 : 576; } track->timescale = st->codec->time_base.den; + while(track->timescale < 10000) + track->timescale *= 2; if (track->mode == MODE_MOV && track->timescale > 100000) av_log(s, AV_LOG_WARNING, "WARNING codec timebase is very high. If duration is too long,\n" diff --git a/tests/ref/fate/vsynth1-avui b/tests/ref/fate/vsynth1-avui index 720fa32dab..03f2b31c38 100644 --- a/tests/ref/fate/vsynth1-avui +++ b/tests/ref/fate/vsynth1-avui @@ -1,4 +1,4 @@ -6094fe77d3a4c49cae45a3de088bdb1a *tests/data/fate/vsynth1-avui.mov +853dad3a1248614c6d61c2f9dc2a999c *tests/data/fate/vsynth1-avui.mov 42624907 tests/data/fate/vsynth1-avui.mov c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-dnxhd-1080i b/tests/ref/fate/vsynth1-dnxhd-1080i index d47f76baf6..899ef9ee07 100644 --- a/tests/ref/fate/vsynth1-dnxhd-1080i +++ b/tests/ref/fate/vsynth1-dnxhd-1080i @@ -1,4 +1,4 @@ -fac7cbb7541f485ec3b1a7a24dbdca8f *tests/data/fate/vsynth1-dnxhd-1080i.mov +9a4781b0a052d9efaafbaf8893db9632 *tests/data/fate/vsynth1-dnxhd-1080i.mov 3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov e55bf857297ba4d911a9d17a984b125d *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 7603200/ 760320 diff --git a/tests/ref/fate/vsynth1-mpeg4 b/tests/ref/fate/vsynth1-mpeg4 index f556c21506..b6da11cef1 100644 --- a/tests/ref/fate/vsynth1-mpeg4 +++ b/tests/ref/fate/vsynth1-mpeg4 @@ -1,4 +1,4 @@ -1283a1904765c40b7602402867a86c4f *tests/data/fate/vsynth1-mpeg4.mp4 +a2acdf772bf7b7641079d8a03ea03ccf *tests/data/fate/vsynth1-mpeg4.mp4 540024 tests/data/fate/vsynth1-mpeg4.mp4 f80ec173d37f2f91add031e95579a220 *tests/data/fate/vsynth1-mpeg4.out.rawvideo stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-prores b/tests/ref/fate/vsynth1-prores index 1df41d67b4..d13bd309ac 100644 --- a/tests/ref/fate/vsynth1-prores +++ b/tests/ref/fate/vsynth1-prores @@ -1,4 +1,4 @@ -31159cc9d1693bc66ad7a3083c48bcc4 *tests/data/fate/vsynth1-prores.mov +17a598a8cc6b899c79e3c69b9679e08d *tests/data/fate/vsynth1-prores.mov 5022811 tests/data/fate/vsynth1-prores.mov a2e2d1d45341a94ff994d1d92629f778 *tests/data/fate/vsynth1-prores.out.rawvideo stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-prores_kostya b/tests/ref/fate/vsynth1-prores_kostya index f974a7a430..aa28aa23b2 100644 --- a/tests/ref/fate/vsynth1-prores_kostya +++ b/tests/ref/fate/vsynth1-prores_kostya @@ -1,4 +1,4 @@ -e7a7e17a40df5d1296cea05d55bd5724 *tests/data/fate/vsynth1-prores_kostya.mov +504b53c891d5bd917d5cf5190c312a20 *tests/data/fate/vsynth1-prores_kostya.mov 3858901 tests/data/fate/vsynth1-prores_kostya.mov 0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores_kostya.out.rawvideo stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-qtrle b/tests/ref/fate/vsynth1-qtrle index 8c12699ea3..081707d0e0 100644 --- a/tests/ref/fate/vsynth1-qtrle +++ b/tests/ref/fate/vsynth1-qtrle @@ -1,4 +1,4 @@ -9c6ee876369fceac1ff2478a0225bc9b *tests/data/fate/vsynth1-qtrle.mov +f66efb8a1fd455ef31de540df9a81909 *tests/data/fate/vsynth1-qtrle.mov 15263148 tests/data/fate/vsynth1-qtrle.mov 93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-qtrle.out.rawvideo stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-qtrlegray b/tests/ref/fate/vsynth1-qtrlegray index 3fe3e30378..99ec831c2a 100644 --- a/tests/ref/fate/vsynth1-qtrlegray +++ b/tests/ref/fate/vsynth1-qtrlegray @@ -1,4 +1,4 @@ -dfb185e38b3557eca0ead72d57ca48f8 *tests/data/fate/vsynth1-qtrlegray.mov +a9f365910ce1eb0ccbc05b68ca7cfafb *tests/data/fate/vsynth1-qtrlegray.mov 5113284 tests/data/fate/vsynth1-qtrlegray.mov 29def4aed035ed65d3a89f7d382fccbe *tests/data/fate/vsynth1-qtrlegray.out.rawvideo stddev: 25.95 PSNR: 19.85 MAXDIFF: 122 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth1-svq1 b/tests/ref/fate/vsynth1-svq1 index 0c40dbd4b2..7468b36e4d 100644 --- a/tests/ref/fate/vsynth1-svq1 +++ b/tests/ref/fate/vsynth1-svq1 @@ -1,4 +1,4 @@ -4654e7af0d4aa58c3db1eb145e278038 *tests/data/fate/vsynth1-svq1.mov +f2930c19bd18eb03c1f984a72cdb67c8 *tests/data/fate/vsynth1-svq1.mov 1334223 tests/data/fate/vsynth1-svq1.mov 9cc35c54b2c77d36bd7e308b393c1f81 *tests/data/fate/vsynth1-svq1.out.rawvideo stddev: 9.58 PSNR: 28.50 MAXDIFF: 210 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-avui b/tests/ref/fate/vsynth2-avui index 7489018fe4..59bac8d604 100644 --- a/tests/ref/fate/vsynth2-avui +++ b/tests/ref/fate/vsynth2-avui @@ -1,4 +1,4 @@ -4b05ddf2d099b9189978032a18b376ea *tests/data/fate/vsynth2-avui.mov +d6ed112daf14e73ea50f1c32ecc6d4ce *tests/data/fate/vsynth2-avui.mov 42624907 tests/data/fate/vsynth2-avui.mov dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-dnxhd-1080i b/tests/ref/fate/vsynth2-dnxhd-1080i index 61d3910981..874e60bc55 100644 --- a/tests/ref/fate/vsynth2-dnxhd-1080i +++ b/tests/ref/fate/vsynth2-dnxhd-1080i @@ -1,4 +1,4 @@ -30ce40fa86812462456a6e68c79a0f6a *tests/data/fate/vsynth2-dnxhd-1080i.mov +93b878dcf8f2ecc9798d0e0885c9eec9 *tests/data/fate/vsynth2-dnxhd-1080i.mov 3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov 27edc8dfe2ca19097c7f9119705b3a60 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 7603200/ 760320 diff --git a/tests/ref/fate/vsynth2-mpeg4 b/tests/ref/fate/vsynth2-mpeg4 index ae56b6e833..399ef58e3f 100644 --- a/tests/ref/fate/vsynth2-mpeg4 +++ b/tests/ref/fate/vsynth2-mpeg4 @@ -1,4 +1,4 @@ -d87d88d02c63f07e574c39a72a95a3af *tests/data/fate/vsynth2-mpeg4.mp4 +04f74c54f4db25e1d454ede9216632c1 *tests/data/fate/vsynth2-mpeg4.mp4 119661 tests/data/fate/vsynth2-mpeg4.mp4 9a1e085d9e488c5ead0c940c9612a37a *tests/data/fate/vsynth2-mpeg4.out.rawvideo stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-prores b/tests/ref/fate/vsynth2-prores index 5db45d9a13..089fc6c1f0 100644 --- a/tests/ref/fate/vsynth2-prores +++ b/tests/ref/fate/vsynth2-prores @@ -1,4 +1,4 @@ -0faf42c187120c61d64a5e0cea4fc92a *tests/data/fate/vsynth2-prores.mov +2fb771b09172b82d045772b60084c923 *tests/data/fate/vsynth2-prores.mov 2844066 tests/data/fate/vsynth2-prores.mov b5844025c0f4c7c37db702c3213db232 *tests/data/fate/vsynth2-prores.out.rawvideo stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-prores_kostya b/tests/ref/fate/vsynth2-prores_kostya index 6128b8cc3c..3566f1da3c 100644 --- a/tests/ref/fate/vsynth2-prores_kostya +++ b/tests/ref/fate/vsynth2-prores_kostya @@ -1,4 +1,4 @@ -80dbde33cf16cde01e6229313ac7ddc7 *tests/data/fate/vsynth2-prores_kostya.mov +fcfd0e077ed36d46719d34248c0d6281 *tests/data/fate/vsynth2-prores_kostya.mov 3884586 tests/data/fate/vsynth2-prores_kostya.mov ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_kostya.out.rawvideo stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-qtrle b/tests/ref/fate/vsynth2-qtrle index d3b045b068..b29b7ccf2f 100644 --- a/tests/ref/fate/vsynth2-qtrle +++ b/tests/ref/fate/vsynth2-qtrle @@ -1,4 +1,4 @@ -6ac61c011e1811ebd045535b141351de *tests/data/fate/vsynth2-qtrle.mov +7ff87d3858b742ef2d72a7dd12dea019 *tests/data/fate/vsynth2-qtrle.mov 14798335 tests/data/fate/vsynth2-qtrle.mov 98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-qtrle.out.rawvideo stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-qtrlegray b/tests/ref/fate/vsynth2-qtrlegray index 1306f3e17a..6fa35d1fe6 100644 --- a/tests/ref/fate/vsynth2-qtrlegray +++ b/tests/ref/fate/vsynth2-qtrlegray @@ -1,4 +1,4 @@ -5a66c6d2b2db71eddbc50819483aa647 *tests/data/fate/vsynth2-qtrlegray.mov +4d4eac9e7258dde5fbafe931c4bdca59 *tests/data/fate/vsynth2-qtrlegray.mov 5111273 tests/data/fate/vsynth2-qtrlegray.mov f63b5ebdfdba750e547c25131b0a3fd1 *tests/data/fate/vsynth2-qtrlegray.out.rawvideo stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-svq1 b/tests/ref/fate/vsynth2-svq1 index b2cd35f8b3..ec9cf88be6 100644 --- a/tests/ref/fate/vsynth2-svq1 +++ b/tests/ref/fate/vsynth2-svq1 @@ -1,4 +1,4 @@ -320a7fbbaecc0989df054bf9678bfdf6 *tests/data/fate/vsynth2-svq1.mov +c0a8f7e727a521ff3c1f6f9bd163e63d *tests/data/fate/vsynth2-svq1.mov 766691 tests/data/fate/vsynth2-svq1.mov aa03471dac3f49455a33a2b19fda1098 *tests/data/fate/vsynth2-svq1.out.rawvideo stddev: 3.23 PSNR: 37.93 MAXDIFF: 61 bytes: 7603200/ 7603200 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 7a2eed4a3d..d7ca02fbd1 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -0e5013f259148938ac771186308318db *./tests/data/lavf/lavf.mov +fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov 367365 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -9865100aa9c604d53cc5b4d804f94cdd *./tests/data/lavf/lavf.mov +d3a85fc24ddd07e354645450073a30e3 *./tests/data/lavf/lavf.mov 358455 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 cbc587335946df1f08d838f48ef396f0 *./tests/data/lavf/lavf.mov 377613 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xc882139b -a42f977ed05f641d8aa5a69fc7291d5b *./tests/data/lavf/lavf.mov +7c932d24837f46ef57d3e40a61331565 *./tests/data/lavf/lavf.mov 357837 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 diff --git a/tests/ref/seek/dnxhd_1080i_mov b/tests/ref/seek/dnxhd_1080i_mov index 6c41d67986..a5f0ce916c 100644 --- a/tests/ref/seek/dnxhd_1080i_mov +++ b/tests/ref/seek/dnxhd_1080i_mov @@ -3,41 +3,41 @@ ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 -ret:-1 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 ts:-0.320000 +ret:-1 st: 0 flags:0 ts: 0.788359 +ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 -ret:-1 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 ts:-0.760000 +ret:-1 st: 0 flags:0 ts: 0.365000 +ret: 0 st: 0 flags:1 ts:-0.740859 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 -ret: 0 st: 0 flags:0 ts:-0.040000 +ret: 0 st: 0 flags:0 ts:-0.058359 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 -ret: 0 st: 0 flags:1 ts: 2.840000 +ret: 0 st: 0 flags:1 ts: 2.835859 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 -ret: 0 st: 0 flags:0 ts:-0.480000 +ret: 0 st: 0 flags:0 ts:-0.481641 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 -ret: 0 st: 0 flags:1 ts: 2.400000 +ret: 0 st: 0 flags:1 ts: 2.412500 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 -ret: 0 st: 0 flags:0 ts:-0.920000 +ret: 0 st: 0 flags:0 ts:-0.905000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 -ret: 0 st: 0 flags:1 ts: 2.000000 +ret: 0 st: 0 flags:1 ts: 1.989141 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 ret:-1 st:-1 flags:0 ts: 0.883340 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size:606208 -ret:-1 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 ts: 1.560000 +ret:-1 st: 0 flags:0 ts: 2.671641 +ret: 0 st: 0 flags:1 ts: 1.565859 ret: 0 st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208 ret:-1 st:-1 flags:0 ts: 0.460008 ret: 0 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/seek/lavf_mov b/tests/ref/seek/lavf_mov index c321a8eba0..9563a0d3a5 100644 --- a/tests/ref/seek/lavf_mov +++ b/tests/ref/seek/lavf_mov @@ -3,9 +3,9 @@ ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 -ret: 0 st: 0 flags:0 ts: 0.800000 +ret: 0 st: 0 flags:0 ts: 0.788359 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 -ret: 0 st: 0 flags:1 ts:-0.320000 +ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 ret:-1 st: 1 flags:0 ts: 2.576667 ret: 0 st: 1 flags:1 ts: 1.470839 @@ -14,8 +14,8 @@ ret: 0 st:-1 flags:0 ts: 0.365002 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 -ret:-1 st: 0 flags:0 ts: 2.160000 -ret: 0 st: 0 flags:1 ts: 1.040000 +ret:-1 st: 0 flags:0 ts: 2.153359 +ret: 0 st: 0 flags:1 ts: 1.047500 ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 ret: 0 st: 1 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 @@ -24,9 +24,9 @@ ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164185 size: 1024 -ret: 0 st: 0 flags:0 ts:-0.480000 +ret: 0 st: 0 flags:0 ts:-0.481641 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 -ret: 0 st: 0 flags:1 ts: 2.400000 +ret: 0 st: 0 flags:1 ts: 2.412500 ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 ret:-1 st: 1 flags:0 ts: 1.306667 ret: 0 st: 1 flags:1 ts: 0.200839 @@ -35,9 +35,9 @@ ret: 0 st:-1 flags:0 ts:-0.904994 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 -ret: 0 st: 0 flags:0 ts: 0.880000 +ret: 0 st: 0 flags:0 ts: 0.883359 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 -ret: 0 st: 0 flags:1 ts:-0.240000 +ret: 0 st: 0 flags:1 ts:-0.222500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 ret:-1 st: 1 flags:0 ts: 2.671678 ret: 0 st: 1 flags:1 ts: 1.565850 diff --git a/tests/ref/seek/mpeg4_mp4 b/tests/ref/seek/mpeg4_mp4 index 70cff1efe4..b1c8a19db8 100644 --- a/tests/ref/seek/mpeg4_mp4 +++ b/tests/ref/seek/mpeg4_mp4 @@ -3,46 +3,46 @@ ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 75140 size: 10776 -ret: 0 st: 0 flags:0 ts: 0.800000 +ret: 0 st: 0 flags:0 ts: 0.788359 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 47228 size: 9634 -ret: 0 st: 0 flags:1 ts:-0.320000 +ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 75140 size: 10776 -ret: 0 st: 0 flags:0 ts: 0.360000 +ret: 0 st: 0 flags:0 ts: 0.365000 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 23271 size: 8524 -ret: 0 st: 0 flags:1 ts:-0.760000 +ret: 0 st: 0 flags:1 ts:-0.740859 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 47228 size: 9634 -ret: 0 st: 0 flags:0 ts:-0.040000 +ret: 0 st: 0 flags:0 ts:-0.058359 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 -ret: 0 st: 0 flags:1 ts: 2.840000 +ret: 0 st: 0 flags:1 ts: 2.835859 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182 ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 23271 size: 8524 -ret: 0 st: 0 flags:0 ts:-0.480000 +ret: 0 st: 0 flags:0 ts:-0.481641 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 -ret: 0 st: 0 flags:1 ts: 2.400000 +ret: 0 st: 0 flags:1 ts: 2.412500 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182 ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 75140 size: 10776 ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 -ret: 0 st: 0 flags:0 ts:-0.920000 +ret: 0 st: 0 flags:0 ts:-0.905000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 -ret: 0 st: 0 flags:1 ts: 2.000000 +ret: 0 st: 0 flags:1 ts: 1.989141 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 47228 size: 9634 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 44 size: 8719 -ret:-1 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 ts: 1.560000 +ret:-1 st: 0 flags:0 ts: 2.671641 +ret: 0 st: 0 flags:1 ts: 1.565859 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 75140 size: 10776 ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 23271 size: 8524 diff --git a/tests/ref/seek/svq1_mov b/tests/ref/seek/svq1_mov index 17bb99e618..33fe33e916 100644 --- a/tests/ref/seek/svq1_mov +++ b/tests/ref/seek/svq1_mov @@ -3,46 +3,46 @@ ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636 -ret: 0 st: 0 flags:0 ts: 0.800000 +ret: 0 st: 0 flags:0 ts: 0.788359 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552 -ret: 0 st: 0 flags:1 ts:-0.320000 +ret: 0 st: 0 flags:1 ts:-0.317500 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636 -ret: 0 st: 0 flags:0 ts: 0.360000 +ret: 0 st: 0 flags:0 ts: 0.365000 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896 -ret: 0 st: 0 flags:1 ts:-0.760000 +ret: 0 st: 0 flags:1 ts:-0.740859 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552 -ret: 0 st: 0 flags:0 ts:-0.040000 +ret: 0 st: 0 flags:0 ts:-0.058359 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 -ret: 0 st: 0 flags:1 ts: 2.840000 +ret: 0 st: 0 flags:1 ts: 2.835859 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888 ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896 -ret: 0 st: 0 flags:0 ts:-0.480000 +ret: 0 st: 0 flags:0 ts:-0.481641 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 -ret: 0 st: 0 flags:1 ts: 2.400000 +ret: 0 st: 0 flags:1 ts: 2.412500 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888 ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636 ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 -ret: 0 st: 0 flags:0 ts:-0.920000 +ret: 0 st: 0 flags:0 ts:-0.905000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 -ret: 0 st: 0 flags:1 ts: 2.000000 +ret: 0 st: 0 flags:1 ts: 1.989141 ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 22300 -ret:-1 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 ts: 1.560000 +ret:-1 st: 0 flags:0 ts: 2.671641 +ret: 0 st: 0 flags:1 ts: 1.565859 ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636 ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896