ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 45 insertions, 44 deletions

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