lavf/utils: rewrite real fps calculation code.

The new code is free of biasing to the first timestamps
Fixes fraps.fps.test.zip

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

1 files changed, 207 insertions, 207 deletions

diff --git a/tests/ref/fate/cscd b/tests/ref/fate/cscd
index 8b89e80a10..e667984aaa 100644
--- a/tests/ref/fate/cscd
+++ b/tests/ref/fate/cscd
@@ -1,208 +1,208 @@
 0, 0, 270000, 0xf90015d8
-0, 2865, 270000, 0xf90015d8
-0, 5729, 270000, 0xf90015d8
-0, 8594, 270000, 0xf90015d8
-0, 11459, 270000, 0xf90015d8
-0, 14324, 270000, 0xf90015d8
-0, 17188, 270000, 0xf90015d8
-0, 20053, 270000, 0xf90015d8
-0, 22918, 270000, 0xf90015d8
-0, 25782, 270000, 0xf90015d8
-0, 28647, 270000, 0xf90015d8
-0, 31512, 270000, 0xf90015d8
-0, 34377, 270000, 0xf90015d8
-0, 37241, 270000, 0xf90015d8
-0, 40106, 270000, 0xf90015d8
-0, 42971, 270000, 0xf90015d8
-0, 45836, 270000, 0xf90015d8
-0, 48700, 270000, 0xf90015d8
-0, 51565, 270000, 0xf90015d8
-0, 54430, 270000, 0xf90015d8
-0, 57294, 270000, 0xf90015d8
-0, 60159, 270000, 0xf90015d8
-0, 63024, 270000, 0xf90015d8
-0, 65889, 270000, 0xf90015d8
-0, 68753, 270000, 0xf90015d8
-0, 71618, 270000, 0xf90015d8
-0, 74483, 270000, 0xf90015d8
-0, 77347, 270000, 0xf90015d8
-0, 80212, 270000, 0xf90015d8
-0, 83077, 270000, 0xf90015d8
-0, 85942, 270000, 0xf90015d8
-0, 88806, 270000, 0xf90015d8
-0, 91671, 270000, 0xf90015d8
-0, 94536, 270000, 0xf90015d8
-0, 97401, 270000, 0xf90015d8
-0, 100265, 270000, 0xf90015d8
-0, 103130, 270000, 0xf90015d8
-0, 105995, 270000, 0xf90015d8
-0, 108859, 270000, 0xf90015d8
-0, 111724, 270000, 0x1f9c15d8
-0, 114589, 270000, 0x436f15d8
-0, 117454, 270000, 0xe90115d8
-0, 120318, 270000, 0xe90115d8
-0, 123183, 270000, 0x8ea215d8
-0, 126048, 270000, 0x424015d8
-0, 128912, 270000, 0x0ce315d8
-0, 131777, 270000, 0x14bc15d8
-0, 134642, 270000, 0x2a9215d8
-0, 137507, 270000, 0x233f15d8
-0, 140371, 270000, 0x764b15d8
-0, 143236, 270000, 0xf76115d8
-0, 146101, 270000, 0xbbe015d8
-0, 148966, 270000, 0x95af15d8
-0, 151830, 270000, 0x324815d8
-0, 154695, 270000, 0x311915d8
-0, 157560, 270000, 0x090ef191
-0, 160424, 270000, 0xd88974dc
-0, 163289, 270000, 0xfa7f58df
-0, 166154, 270000, 0x78f849c3
-0, 169019, 270000, 0xae174892
-0, 171883, 270000, 0x9d4e2332
-0, 174748, 270000, 0x874b09b4
-0, 177613, 270000, 0x4069fed6
-0, 180477, 270000, 0x4069fed6
-0, 183342, 270000, 0x4069fed6
-0, 186207, 270000, 0x4069fed6
-0, 189072, 270000, 0x4069fed6
-0, 191936, 270000, 0x4069fed6
-0, 194801, 270000, 0x4069fed6
-0, 197666, 270000, 0x4069fed6
-0, 200531, 270000, 0x4069fed6
-0, 203395, 270000, 0x4069fed6
-0, 206260, 270000, 0x4069fed6
-0, 209125, 270000, 0x773db046
-0, 211989, 270000, 0x773db046
-0, 214854, 270000, 0x773db046
-0, 217719, 270000, 0x773db046
-0, 220584, 270000, 0x773db046
-0, 223448, 270000, 0x773db046
-0, 226313, 270000, 0x773db046
-0, 229178, 270000, 0x773db046
-0, 232042, 270000, 0x773db046
-0, 234907, 270000, 0x773db046
-0, 237772, 270000, 0x773db046
-0, 240637, 270000, 0x773db046
-0, 243501, 270000, 0x773db046
-0, 246366, 270000, 0x773db046
-0, 249231, 270000, 0x773db046
-0, 252095, 270000, 0x773db046
-0, 254960, 270000, 0x773db046
-0, 257825, 270000, 0x17b9aec9
-0, 260690, 270000, 0x622fad4c
-0, 263554, 270000, 0xdaea3aef
-0, 266419, 270000, 0x61bb10e3
-0, 269284, 270000, 0xfc37ee0c
-0, 272149, 270000, 0x50dbd01e
-0, 275013, 270000, 0xcd66c27c
-0, 277878, 270000, 0xd13f1e4f
-0, 280743, 270000, 0xa4a2dbf5
-0, 283607, 270000, 0xf302c9ab
-0, 286472, 270000, 0x4479f7fe
-0, 289337, 270000, 0x1afe92c8
-0, 292202, 270000, 0x3007f4c3
-0, 295066, 270000, 0x5834c096
-0, 297931, 270000, 0x40109126
-0, 300796, 270000, 0x0a7b8882
-0, 303660, 270000, 0x15b8635d
-0, 306525, 270000, 0xeaa5598e
-0, 309390, 270000, 0x0b7b5489
-0, 312255, 270000, 0x0b7b5489
-0, 315119, 270000, 0x0b7b5489
-0, 317984, 270000, 0x0b7b5489
-0, 320849, 270000, 0x8f0e6eaa
-0, 323714, 270000, 0xc46fc0f2
-0, 326578, 270000, 0xadd7e605
-0, 329443, 270000, 0x9d23a056
-0, 332308, 270000, 0x365afa63
-0, 335172, 270000, 0x6ac3bda2
-0, 338037, 270000, 0x14f5daf2
-0, 340902, 270000, 0x4b3afb6a
-0, 343767, 270000, 0x1a3302e3
-0, 346631, 270000, 0x1a3302e3
-0, 349496, 270000, 0x1a3302e3
-0, 352361, 270000, 0x1a3302e3
-0, 355225, 270000, 0xc15526e2
-0, 358090, 270000, 0x3dd73006
-0, 360955, 270000, 0x60abb5bc
-0, 363820, 270000, 0xb960c27c
-0, 366684, 270000, 0x8fa4c01c
-0, 369549, 270000, 0x8fa4c01c
-0, 372414, 270000, 0x8fa4c01c
-0, 375279, 270000, 0xb20dcc38
-0, 378143, 270000, 0x03c6ad3c
-0, 381008, 270000, 0xe550b194
-0, 383873, 270000, 0xe550b194
-0, 386737, 270000, 0xe550b194
-0, 389602, 270000, 0xe550b194
-0, 392467, 270000, 0xe550b194
-0, 395332, 270000, 0xe550b194
-0, 398196, 270000, 0xe550b194
-0, 401061, 270000, 0xe550b194
-0, 403926, 270000, 0xe550b194
-0, 406790, 270000, 0xe550b194
-0, 409655, 270000, 0xe550b194
-0, 412520, 270000, 0xe550b194
-0, 415385, 270000, 0xe550b194
-0, 418249, 270000, 0xe550b194
-0, 421114, 270000, 0x4550a014
-0, 423979, 270000, 0xaf639da8
-0, 426844, 270000, 0xe4229da8
-0, 429708, 270000, 0x315d9da8
-0, 432573, 270000, 0x7e899da8
-0, 435438, 270000, 0x99b9a8a0
-0, 438302, 270000, 0x4588ac2a
-0, 441167, 270000, 0x1e79ae6e
-0, 444032, 270000, 0xa003cb14
-0, 446897, 270000, 0x03ef1bb8
-0, 449761, 270000, 0x3b3f30fc
-0, 452626, 270000, 0x4dad3525
-0, 455491, 270000, 0x5b600c12
-0, 458355, 270000, 0x75a1fab3
-0, 461220, 270000, 0xc9f7d9ad
-0, 464085, 270000, 0x9eaec58d
-0, 466950, 270000, 0xb91bc3e8
-0, 469814, 270000, 0x77bdbbfb
-0, 472679, 270000, 0x77bdbbfb
-0, 475544, 270000, 0x77bdbbfb
-0, 478408, 270000, 0x77bdbbfb
-0, 481273, 270000, 0x77bdbbfb
-0, 484138, 270000, 0x77bdbbfb
-0, 487003, 270000, 0x3d54eac2
-0, 489867, 270000, 0x3d54eac2
-0, 492732, 270000, 0x3d54eac2
-0, 495597, 270000, 0x3d54eac2
-0, 498462, 270000, 0x3d54eac2
-0, 501326, 270000, 0x3d54eac2
-0, 504191, 270000, 0x3d54eac2
-0, 507056, 270000, 0x3d54eac2
-0, 509920, 270000, 0x3d54eac2
-0, 512785, 270000, 0x3d54eac2
-0, 515650, 270000, 0x3d54eac2
-0, 518515, 270000, 0x3d54eac2
-0, 521379, 270000, 0x3d54eac2
-0, 524244, 270000, 0x3d54eac2
-0, 527109, 270000, 0x3d54eac2
-0, 529973, 270000, 0x3d54eac2
-0, 532838, 270000, 0x3d54eac2
-0, 535703, 270000, 0x3d54eac2
-0, 538568, 270000, 0x3d54eac2
-0, 541432, 270000, 0x5f3609ba
-0, 544297, 270000, 0x80921b0c
-0, 547162, 270000, 0x80921b0c
-0, 550027, 270000, 0x80921b0c
-0, 552891, 270000, 0x80921b0c
-0, 555756, 270000, 0x80921b0c
-0, 558621, 270000, 0x80921b0c
-0, 561485, 270000, 0x80921b0c
-0, 564350, 270000, 0x80921b0c
-0, 567215, 270000, 0x80921b0c
-0, 570080, 270000, 0x80921b0c
-0, 572944, 270000, 0x80921b0c
-0, 575809, 270000, 0x80921b0c
-0, 578674, 270000, 0x80921b0c
-0, 581538, 270000, 0x80921b0c
-0, 584403, 270000, 0x80921b0c
-0, 587268, 270000, 0x80921b0c
-0, 590133, 270000, 0xf0e626a8
-0, 592997, 270000, 0xf0e626a8
+0, 450, 270000, 0xf90015d8
+0, 900, 270000, 0xf90015d8
+0, 1350, 270000, 0xf90015d8
+0, 1800, 270000, 0xf90015d8
+0, 2250, 270000, 0xf90015d8
+0, 2700, 270000, 0xf90015d8
+0, 3150, 270000, 0xf90015d8
+0, 3600, 270000, 0xf90015d8
+0, 4050, 270000, 0xf90015d8
+0, 4500, 270000, 0xf90015d8
+0, 4950, 270000, 0xf90015d8
+0, 5400, 270000, 0xf90015d8
+0, 5850, 270000, 0xf90015d8
+0, 6300, 270000, 0xf90015d8
+0, 6750, 270000, 0xf90015d8
+0, 7200, 270000, 0xf90015d8
+0, 7650, 270000, 0xf90015d8
+0, 8100, 270000, 0xf90015d8
+0, 8550, 270000, 0xf90015d8
+0, 9000, 270000, 0xf90015d8
+0, 9450, 270000, 0xf90015d8
+0, 9900, 270000, 0xf90015d8
+0, 10350, 270000, 0xf90015d8
+0, 10800, 270000, 0xf90015d8
+0, 11250, 270000, 0xf90015d8
+0, 11700, 270000, 0xf90015d8
+0, 12150, 270000, 0xf90015d8
+0, 12600, 270000, 0xf90015d8
+0, 13050, 270000, 0xf90015d8
+0, 13500, 270000, 0xf90015d8
+0, 13950, 270000, 0xf90015d8
+0, 14400, 270000, 0xf90015d8
+0, 14850, 270000, 0xf90015d8
+0, 15300, 270000, 0xf90015d8
+0, 15750, 270000, 0xf90015d8
+0, 16200, 270000, 0xf90015d8
+0, 16650, 270000, 0xf90015d8
+0, 17100, 270000, 0xf90015d8
+0, 17550, 270000, 0x1f9c15d8
+0, 18000, 270000, 0x436f15d8
+0, 18450, 270000, 0xe90115d8
+0, 18900, 270000, 0xe90115d8
+0, 19350, 270000, 0x8ea215d8
+0, 19800, 270000, 0x424015d8
+0, 20250, 270000, 0x0ce315d8
+0, 20700, 270000, 0x14bc15d8
+0, 21150, 270000, 0x2a9215d8
+0, 21600, 270000, 0x233f15d8
+0, 22050, 270000, 0x764b15d8
+0, 22500, 270000, 0xf76115d8
+0, 22950, 270000, 0xbbe015d8
+0, 23400, 270000, 0x95af15d8
+0, 23850, 270000, 0x324815d8
+0, 24300, 270000, 0x311915d8
+0, 24750, 270000, 0x090ef191
+0, 25200, 270000, 0xd88974dc
+0, 25650, 270000, 0xfa7f58df
+0, 26100, 270000, 0x78f849c3
+0, 26550, 270000, 0xae174892
+0, 27000, 270000, 0x9d4e2332
+0, 27450, 270000, 0x874b09b4
+0, 27900, 270000, 0x4069fed6
+0, 28350, 270000, 0x4069fed6
+0, 28800, 270000, 0x4069fed6
+0, 29250, 270000, 0x4069fed6
+0, 29700, 270000, 0x4069fed6
+0, 30150, 270000, 0x4069fed6
+0, 30600, 270000, 0x4069fed6
+0, 31050, 270000, 0x4069fed6
+0, 31500, 270000, 0x4069fed6
+0, 31950, 270000, 0x4069fed6
+0, 32400, 270000, 0x4069fed6
+0, 32850, 270000, 0x773db046
+0, 33300, 270000, 0x773db046
+0, 33750, 270000, 0x773db046
+0, 34200, 270000, 0x773db046
+0, 34650, 270000, 0x773db046
+0, 35100, 270000, 0x773db046
+0, 35550, 270000, 0x773db046
+0, 36000, 270000, 0x773db046
+0, 36450, 270000, 0x773db046
+0, 36900, 270000, 0x773db046
+0, 37350, 270000, 0x773db046
+0, 37800, 270000, 0x773db046
+0, 38250, 270000, 0x773db046
+0, 38700, 270000, 0x773db046
+0, 39150, 270000, 0x773db046
+0, 39600, 270000, 0x773db046
+0, 40050, 270000, 0x773db046
+0, 40500, 270000, 0x17b9aec9
+0, 40950, 270000, 0x622fad4c
+0, 41400, 270000, 0xdaea3aef
+0, 41850, 270000, 0x61bb10e3
+0, 42300, 270000, 0xfc37ee0c
+0, 42750, 270000, 0x50dbd01e
+0, 43200, 270000, 0xcd66c27c
+0, 43650, 270000, 0xd13f1e4f
+0, 44100, 270000, 0xa4a2dbf5
+0, 44550, 270000, 0xf302c9ab
+0, 45000, 270000, 0x4479f7fe
+0, 45450, 270000, 0x1afe92c8
+0, 45900, 270000, 0x3007f4c3
+0, 46350, 270000, 0x5834c096
+0, 46800, 270000, 0x40109126
+0, 47250, 270000, 0x0a7b8882
+0, 47700, 270000, 0x15b8635d
+0, 48150, 270000, 0xeaa5598e
+0, 48600, 270000, 0x0b7b5489
+0, 49050, 270000, 0x0b7b5489
+0, 49500, 270000, 0x0b7b5489
+0, 49950, 270000, 0x0b7b5489
+0, 50400, 270000, 0x8f0e6eaa
+0, 50850, 270000, 0xc46fc0f2
+0, 51300, 270000, 0xadd7e605
+0, 51750, 270000, 0x9d23a056
+0, 52200, 270000, 0x365afa63
+0, 52650, 270000, 0x6ac3bda2
+0, 53100, 270000, 0x14f5daf2
+0, 53550, 270000, 0x4b3afb6a
+0, 54000, 270000, 0x1a3302e3
+0, 54450, 270000, 0x1a3302e3
+0, 54900, 270000, 0x1a3302e3
+0, 55350, 270000, 0x1a3302e3
+0, 55800, 270000, 0xc15526e2
+0, 56250, 270000, 0x3dd73006
+0, 56700, 270000, 0x60abb5bc
+0, 57150, 270000, 0xb960c27c
+0, 57600, 270000, 0x8fa4c01c
+0, 58050, 270000, 0x8fa4c01c
+0, 58500, 270000, 0x8fa4c01c
+0, 58950, 270000, 0xb20dcc38
+0, 59400, 270000, 0x03c6ad3c
+0, 59850, 270000, 0xe550b194
+0, 60300, 270000, 0xe550b194
+0, 60750, 270000, 0xe550b194
+0, 61200, 270000, 0xe550b194
+0, 61650, 270000, 0xe550b194
+0, 62100, 270000, 0xe550b194
+0, 62550, 270000, 0xe550b194
+0, 63000, 270000, 0xe550b194
+0, 63450, 270000, 0xe550b194
+0, 63900, 270000, 0xe550b194
+0, 64350, 270000, 0xe550b194
+0, 64800, 270000, 0xe550b194
+0, 65250, 270000, 0xe550b194
+0, 65700, 270000, 0xe550b194
+0, 66150, 270000, 0x4550a014
+0, 66600, 270000, 0xaf639da8
+0, 67050, 270000, 0xe4229da8
+0, 67500, 270000, 0x315d9da8
+0, 67950, 270000, 0x7e899da8
+0, 68400, 270000, 0x99b9a8a0
+0, 68850, 270000, 0x4588ac2a
+0, 69300, 270000, 0x1e79ae6e
+0, 69750, 270000, 0xa003cb14
+0, 70200, 270000, 0x03ef1bb8
+0, 70650, 270000, 0x3b3f30fc
+0, 71100, 270000, 0x4dad3525
+0, 71550, 270000, 0x5b600c12
+0, 72000, 270000, 0x75a1fab3
+0, 72450, 270000, 0xc9f7d9ad
+0, 72900, 270000, 0x9eaec58d
+0, 73350, 270000, 0xb91bc3e8
+0, 73800, 270000, 0x77bdbbfb
+0, 74250, 270000, 0x77bdbbfb
+0, 74700, 270000, 0x77bdbbfb
+0, 75150, 270000, 0x77bdbbfb
+0, 75600, 270000, 0x77bdbbfb
+0, 76050, 270000, 0x77bdbbfb
+0, 76500, 270000, 0x3d54eac2
+0, 76950, 270000, 0x3d54eac2
+0, 77400, 270000, 0x3d54eac2
+0, 77850, 270000, 0x3d54eac2
+0, 78300, 270000, 0x3d54eac2
+0, 78750, 270000, 0x3d54eac2
+0, 79200, 270000, 0x3d54eac2
+0, 79650, 270000, 0x3d54eac2
+0, 80100, 270000, 0x3d54eac2
+0, 80550, 270000, 0x3d54eac2
+0, 81000, 270000, 0x3d54eac2
+0, 81450, 270000, 0x3d54eac2
+0, 81900, 270000, 0x3d54eac2
+0, 82350, 270000, 0x3d54eac2
+0, 82800, 270000, 0x3d54eac2
+0, 83250, 270000, 0x3d54eac2
+0, 83700, 270000, 0x3d54eac2
+0, 84150, 270000, 0x3d54eac2
+0, 84600, 270000, 0x3d54eac2
+0, 85050, 270000, 0x5f3609ba
+0, 85500, 270000, 0x80921b0c
+0, 85950, 270000, 0x80921b0c
+0, 86400, 270000, 0x80921b0c
+0, 86850, 270000, 0x80921b0c
+0, 87300, 270000, 0x80921b0c
+0, 87750, 270000, 0x80921b0c
+0, 88200, 270000, 0x80921b0c
+0, 88650, 270000, 0x80921b0c
+0, 89100, 270000, 0x80921b0c
+0, 89550, 270000, 0x80921b0c
+0, 90000, 270000, 0x80921b0c
+0, 90450, 270000, 0x80921b0c
+0, 90900, 270000, 0x80921b0c
+0, 91350, 270000, 0x80921b0c
+0, 91800, 270000, 0x80921b0c
+0, 92250, 270000, 0x80921b0c
+0, 92700, 270000, 0xf0e626a8
+0, 93150, 270000, 0xf0e626a8