diff mbox series

[FFmpeg-devel] fate/ffmpeg: Fix shortest tests

Message ID AM7PR03MB66609566E787A3ED0507EFAB8F699@AM7PR03MB6660.eurprd03.prod.outlook.com
State Superseded
Headers show
Series [FFmpeg-devel] fate/ffmpeg: Fix shortest tests
Related show

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Dec. 2, 2021, 9:47 a.m. UTC
The mpeg4 encoder is slice-threaded and its output depends upon
the number of threads used. Therefore all tests of this encoder
use a hardcoded number of threads (ENC_OPTS in fate-run.sh contains
"-threads 1"; only the vsynth%-mpeg4-thread tests override this
for the mpeg4 encoder, but they also use a hardcoded value to
be consistent across different systems); only the new shortest
and copy-shortest[12] (implicitly due to the sample used) tests
don't and this leads to FATE-failures.
Fix this by explicitly setting the thread count.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Will apply this as soon as patchwork confirms it to be working.
The current ref files are btw created with a thread count of nine
(which is the default thread count when av_cpu_count() returns eight).

 tests/fate/ffmpeg.mak         |   4 +-
 tests/ref/fate/copy-shortest1 | 102 +++++++++++++++++-----------------
 tests/ref/fate/copy-shortest2 | 102 +++++++++++++++++-----------------
 tests/ref/fate/shortest       | 100 ++++++++++++++++-----------------
 4 files changed, 154 insertions(+), 154 deletions(-)
diff mbox series

Patch

diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index 8190eb974a..3651f57c0d 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -88,7 +88,7 @@  fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \
 
 FATE_FFMPEG-$(call ALLYES, SINE_FILTER AMIX_FILTER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-shortest
 fate-shortest: tests/data/vsynth_lena.yuv
-fate-shortest: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -c:a ac3_fixed -shortest
+fate-shortest: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest
 
 FATE_STREAMCOPY-$(call ALLYES, EAC3_DEMUXER MOV_MUXER) += fate-copy-trac3074
 fate-copy-trac3074: $(SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3
@@ -140,7 +140,7 @@  tests/data/audio_shorter_than_video.nut: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
 	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
         -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \
         -f lavfi -i "sine=1000:d=1" \
-        -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -c:a pcm_s16le -bitexact \
+        -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -threads 1 -c:a pcm_s16le -bitexact \
         -y $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut 2>/dev/null
 
 FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER NUT_MUXER PCM_S16LE_ENCODER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-copy-shortest1
diff --git a/tests/ref/fate/copy-shortest1 b/tests/ref/fate/copy-shortest1
index 6f5593fc15..69204b373a 100644
--- a/tests/ref/fate/copy-shortest1
+++ b/tests/ref/fate/copy-shortest1
@@ -1,7 +1,7 @@ 
 #format: frame checksums
 #version: 2
 #hash: MD5
-#extradata 0,                              30, 226f0a640065a7bbc3a3e6dd5067de5a
+#extradata 0,                              30, 0e11a510b0c7831954402f81dd258188
 #tb 0: 1/51200
 #media_type 0: video
 #codec_id 0: mpeg4
@@ -15,110 +15,110 @@ 
 #channel_layout_name 1: mono
 #stream#, dts,        pts, duration,     size, hash
 1,       -256,       -256,     1536,      416, e3bd415f62aa927e9273151fdf21ebce
-0,          0,          0,     2048,     8876, b18b95893443cf5840d5962ad3456e97
+0,          0,          0,     2048,     8719, bbea2a7487d61d39a0b2f2fe62a4df4a
 1,       1280,       1280,     1536,      418, 6e79527e2af3448d7a0e4a8e29cd9722
-0,       2048,       2048,     2048,     1025, 3c8f2dba6d80ebd4f656ecb772d46c9d
+0,       2048,       2048,     2048,      975, 94f30e410595452ee981d96224516504
 1,       2816,       2816,     1536,      418, cf49595ac385e497672e5a814f7bcd79
-0,       4096,       4096,     2048,     1226, 03470d542c38b78c48df45f19f2958e7
+0,       4096,       4096,     2048,     1167, d3b895191e8a06d19bbc8ac90e564b3b
 1,       4352,       4352,     1536,      418, 846982243d330ab782f0120988d52ade
-0,       6144,       6144,     2048,     1353, 51f123ef389e7ccb20d382ce779d81ed
+0,       6144,       6144,     2048,     1274, 272f548f13dd6a45a5cd187f0e43e635
 1,       5888,       5888,     1536,      418, 77b2d15948434a4831e30c47b8214591
-0,       8192,       8192,     2048,     1421, 19897f392cc3517485bc6acfed2c2e2f
+0,       8192,       8192,     2048,     1361, a0c67fc195fe867ae240dc8c48f85b2e
 1,       7424,       7424,     1536,      418, 4fce87d5cce10f6d0268fb398c385af5
-0,      10240,      10240,     2048,     1446, 6d5a5dc31d09c144fba37c4e569f6e35
+0,      10240,      10240,     2048,     1415, f7a3746adb348eb00042b3eccff54a87
 1,       8960,       8960,     1536,      418, 963f2dac9af4672809521f2174b78f10
 1,      10496,      10496,     1536,      418, eb7a20193c157b02f7b5d5abf802af24
-0,      12288,      12288,     2048,     1483, 299f60d66033bab84ee737c6056e8588
+0,      12288,      12288,     2048,     1421, 8396b1c23f7d39f6f73c3469826317d6
 1,      12032,      12032,     1536,      418, 219b234a1e01d3538bfe09fda58b3289
-0,      14336,      14336,     2048,     1494, 54759f501f33744e81a456b5e4d695f7
+0,      14336,      14336,     2048,     1474, a9c493c020d710af7f2c98b9aae846ff
 1,      13568,      13568,     1536,      418, ef7bd3e9c13f03aa6676629101a9a8a0
-0,      16384,      16384,     2048,     1552, 446661f8d2ee9b82c868cffb26160054
+0,      16384,      16384,     2048,     1467, b801d1a76c84923ab813e9a5d9ebdb78
 1,      15104,      15104,     1536,      418, c5dda974df7e418d9036dff134aad2ae
-0,      18432,      18432,     2048,     1521, 0db5cd946c19b1552eacf56901558e5c
+0,      18432,      18432,     2048,     1469, 22f7fcd055bf124436de9a9432f7c9d2
 1,      16640,      16640,     1536,      418, 48e7a9f574654dd95a325cfec5072254
-0,      20480,      20480,     2048,     1545, 725ac20d7c171e448dce01d660021118
+0,      20480,      20480,     2048,     1506, da18f30d7008f2307ec51863a9873afd
 1,      18176,      18176,     1536,      418, 737d867e328377a3e6623f77f646ea61
-0,      22528,      22528,     2048,     1556, 429e63d26b4b3b95b91547489e49293d
+0,      22528,      22528,     2048,     1520, 2c7d44ca3485373af6cfb3e44e495bf7
 1,      19712,      19712,     1536,      418, 5e2a004ad90ba069cecd9fdc1652388c
-0,      24576,      24576,     2048,     8659, fdf5109e322c9e5b80d9453a6ca4853d
+0,      24576,      24576,     2048,     8524, 0634c69955cbffe94f4e15b288557cac
 1,      21248,      21248,     1536,      418, c694e51e609bdd00749a04294cbd60fb
 1,      22784,      22784,     1536,      418, 6b787ffae0063d9910deebc8b3e98fd4
-0,      26624,      26624,     2048,     1144, 74ee1db0568ccf0c866189e59c8530cc
+0,      26624,      26624,     2048,     1079, f081cbd559dab2b579f40d2fa988a959
 1,      24320,      24320,     1536,      418, eb6d62198a5472a1c179d42cde60b869
-0,      28672,      28672,     2048,     1404, 9ddf9ceb0f25e54813f340c52b78a21f
+0,      28672,      28672,     2048,     1343, fdf8069cd511f4fa185748118acfb72e
 1,      25856,      25856,     1536,      418, 70a6c8e61e8d75f7a310bc7294ad38f6
-0,      30720,      30720,     2048,     1550, 52ca630df0df5d29a3d4d0133e746d39
+0,      30720,      30720,     2048,     1486, e72dfcd069f5be3a30310002b1b5e252
 1,      27392,      27392,     1536,      418, 6847924a11575b3628ccdfd81a2fb1dc
-0,      32768,      32768,     2048,     1549, d999030e465c63639d2c501180ef9f63
+0,      32768,      32768,     2048,     1491, 710c5421d44a8c9356c1477cbcd27c0e
 1,      28928,      28928,     1536,      418, 6f76bbe03d8b4e0080226247e0e54f96
-0,      34816,      34816,     2048,     1582, 2ea6009ba8964412d0be2286296eb255
+0,      34816,      34816,     2048,     1504, 16a6d624b8175f1191ede25e2d588b92
 1,      30464,      30464,     1536,      418, c946a8d690aa31fde929678b594cc432
-0,      36864,      36864,     2048,     1519, ba2c386a35843ce0bb25b4f5c17e2ee6
+0,      36864,      36864,     2048,     1481, 8696aa412629328687bda5e88dd40b81
 1,      32000,      32000,     1536,      418, 3add3833b86a38c229faf8e602f83dcb
-0,      38912,      38912,     2048,     1541, 34e3b4b5eb4ac0a0ab1fee2df6c38007
+0,      38912,      38912,     2048,     1521, 3c974bf799b8e35d295c6567ffeb7276
 1,      33536,      33536,     1536,      418, cb51e6a41f5c4a5f01dd94f58210112b
 1,      35072,      35072,     1536,      418, 66c3570cb8c11386b0601fe4a6eb7ee0
-0,      40960,      40960,     2048,     1578, f7c6d15a0de6088a1547d4be0898387f
+0,      40960,      40960,     2048,     1514, 1a54ec5296f1551a7f67c515e40ca646
 1,      36608,      36608,     1536,      418, 8b986c15b9ab86432c43cedd1a182e8d
-0,      43008,      43008,     2048,     1622, e568e8b1bf951006f7d025890b950e5d
+0,      43008,      43008,     2048,     1562, d285916a1c7a2fb9f37d18bfa977e075
 1,      38144,      38144,     1536,      418, 0dd29cc7f63f2afac3eec5e5944165e7
-0,      45056,      45056,     2048,     1611, a208ef59b6f176a78d6c9113df17cf3d
+0,      45056,      45056,     2048,     1562, 320c26adae1dad1741e02febdbd5b916
 1,      39680,      39680,     1536,      418, c4c14deb03d5048f8c6101260c617fae
-0,      47104,      47104,     2048,     1706, f298b1930c927839470258f50d456dc8
+0,      47104,      47104,     2048,     1629, 60c6ebd71f641ebcff9997ee338d82bf
 1,      41216,      41216,     1536,      418, 4a3480d888fa0dd49a7bbf2669b5d3ed
-0,      49152,      49152,     2048,     9737, 94e0e1fa27e7e57a956e0fc27670e5c8
+0,      49152,      49152,     2048,     9634, b72deda826b002179c46789e92c07978
 1,      42752,      42752,     1536,      418, aaeabe149b9185a6f09c271eb2c656dd
-0,      51200,      51200,     2048,     1323, 248d92526f1e6a0d5e7592b40ac213c0
+0,      51200,      51200,     2048,     1239, 407105508656c920761e60c90540ee18
 1,      44288,      44288,     1536,      418, 0995488ad1bb84ec4a3e738b568484a4
 1,      45824,      45824,     1536,      418, baa39bdfd9f47f7d312312985f59fb72
-0,      53248,      53248,     2048,     1621, 1ee6a5eb09be8ab281d05125c2868c56
+0,      53248,      53248,     2048,     1568, 1e5b232eaf9f35846ae25b881f658e5c
 1,      47360,      47360,     1536,      418, c25bac736a8c356d0a0f9c9299f88880
-0,      55296,      55296,     2048,     1698, db8b8ca03eca285d02dbce6eaaacdfd1
+0,      55296,      55296,     2048,     1641, f79725e348ed7796f2be7c153ce32580
 1,      48896,      48896,     1536,      418, 85378fd6c8b49a1f4c5490ab1e4013ca
-0,      57344,      57344,     2048,     1793, c50e4bdacb3ecef9c94be7b292929018
+0,      57344,      57344,     2048,     1735, ae14fbdbf8777d88077818db0ae346b3
 1,      50432,      50432,     1536,      418, 528e28031145f07336cd2a1b9b324ca6
-0,      59392,      59392,     2048,     1805, 1db64693c5ca5595b2f47097ffdfc612
+0,      59392,      59392,     2048,     1760, e943dc0f9ed56fbca1af43c3c3c6dea1
 1,      51968,      51968,     1536,      418, cc9b907fc92fffc61f7e41cdb863d586
-0,      61440,      61440,     2048,     1880, 9f96e1bc1f3b595d6cd626dced55416f
+0,      61440,      61440,     2048,     1798, efb1c91f9aee5c84c92e8cd5a5b58783
 1,      53504,      53504,     1536,      418, fe2f2ca279b14d7053349111578b48c0
-0,      63488,      63488,     2048,     1902, 209393253d103d83d8dddde7fe044953
+0,      63488,      63488,     2048,     1830, 7aa74080b344e63280854570f701e2b8
 1,      55040,      55040,     1536,      418, 5f2c6037aa4b89572a4ed712082ae2ab
-0,      65536,      65536,     2048,     1896, 9a845e06daafc1dd83d77fe507569968
+0,      65536,      65536,     2048,     1835, 566fa13f73b9aa63eed50511b112b191
 1,      56576,      56576,     1536,      418, 17a096694df972c2ef3a9abbe0a9cd6a
 1,      58112,      58112,     1536,      418, c96a64bbfd1aae269e44bfdaea7c8a9c
-0,      67584,      67584,     2048,     1954, 77c37124c545198b688518508299f5f8
+0,      67584,      67584,     2048,     1902, 95933f1710291419d0febd37d5878362
 1,      59648,      59648,     1536,      418, 5f9297244e107134c49fc4982f5a7c1f
-0,      69632,      69632,     2048,     1989, 0b142544ef59e421e33a40f9e685dffa
+0,      69632,      69632,     2048,     1886, 5a8e4c7557ec0d09d40fbfabc5b92e63
 1,      61184,      61184,     1536,      418, da740d2d75b51d6e28bcb068f6a90d41
-0,      71680,      71680,     2048,     2042, f69d73e0af0b4d9ef65205d8a0ee0937
+0,      71680,      71680,     2048,     1949, 3f81e2b8821c22f89501feafebb9d618
 1,      62720,      62720,     1536,      418, 76e6bbbbfa0692659d0d84a30dcfff34
-0,      73728,      73728,     2048,    10838, bd02df61e3f5c0aa572904220aaf04a6
+0,      73728,      73728,     2048,    10776, 29e4a6fdc625965feae7faa8ab239db1
 1,      64256,      64256,     1536,      418, 0bd304182f1693b18c46b0faa682b159
-0,      75776,      75776,     2048,     1511, 6ab5a58771e346bd8756fdd68139ad8e
+0,      75776,      75776,     2048,     1413, 4b5bde19c84eca2c776f6ac45163a0a5
 1,      65792,      65792,     1536,      418, ecf7bd4ba9161338ce2cefc1fdd06098
-0,      77824,      77824,     2048,     1780, 62e0bc487aa55ad381d0a1e7f8b7a477
+0,      77824,      77824,     2048,     1731, 7f46b3e146e52fd500dbf53a3c744662
 1,      67328,      67328,     1536,      418, 4953c0e441ca0ca2e1970b8b31d6c70e
-0,      79872,      79872,     2048,     1953, ad1854098648e499e347cf828202d1d5
+0,      79872,      79872,     2048,     1888, 2bd4182a0fe98db2990c8e39c0500872
 1,      68864,      68864,     1536,      418, 4eb7f24aa46b8f0e6b47d0ca6ec0d56d
 1,      70400,      70400,     1536,      418, df4d73a6acccd3be6663188f4baab996
-0,      81920,      81920,     2048,     2036, da8405d19586da34274a578f4972fd7f
+0,      81920,      81920,     2048,     1989, f3bf07391ef46cba98eb78fdc3707fa3
 1,      71936,      71936,     1536,      418, 5e60f266106b86f19749b64d86b11f43
-0,      83968,      83968,     2048,     1980, e046fca4a3652fad1b0b22e49a290dd8
+0,      83968,      83968,     2048,     1949, 0650751332acc5d5f96f292ffc4add21
 1,      73472,      73472,     1536,      418, cedea148c5f7ddba6f0fbcbe17e6bfbb
-0,      86016,      86016,     2048,     2014, 01806ec06d4cdb2b840a6f7993b648e3
+0,      86016,      86016,     2048,     1956, d52d57b697f4ec90bb1f69fd7ece1952
 1,      75008,      75008,     1536,      416, 97655498b413a59b3f0f6bdc25f69084
-0,      88064,      88064,     2048,     2040, 19c5cc70489711d467ef7ef4414fdf6a
+0,      88064,      88064,     2048,     2012, e25c0bb0ec726fe5c9ade88cf7ae9a19
 1,      76544,      76544,     1536,      418, 0bea3f23db7aafefe50710310af25a9b
-0,      90112,      90112,     2048,     2071, 2bc9f2d22ac276366337341e89efd6cb
+0,      90112,      90112,     2048,     1995, eb0377542bc15580ef8f772ce6f506bd
 1,      78080,      78080,     1536,      418, e763b383810d9a4645901c0d93f98a32
-0,      92160,      92160,     2048,     2117, 7173333f3ff643752b8afea6d5486117
+0,      92160,      92160,     2048,     2078, 7aa93cd366118984932da377f4743de6
 1,      79616,      79616,     1536,      418, f090bb15688066a9c5129348f86245e7
-0,      94208,      94208,     2048,     2169, fda9c958dc9fea54efa935624528a902
+0,      94208,      94208,     2048,     2116, 9d8c672e97c27ed4e3281bb10481914a
 1,      81152,      81152,     1536,      418, beb8658ede31b44326de936b28a2d740
 1,      82688,      82688,     1536,      418, 53987c0214550f387ce03093b83f4225
-0,      96256,      96256,     2048,     2096, 9516005a46f05f1a582524be91c4d672
+0,      96256,      96256,     2048,     2024, 18d42dbec2fa24fd30374d79a054cd4f
 1,      84224,      84224,     1536,      418, d3c37c202144070892528cc0a0ff3112
-0,      98304,      98304,     2048,    11219, 834f992165c0ee5e5a60fff78610b449
+0,      98304,      98304,     2048,    11182, e35a2ab846029effdbca0e43639717f2
 1,      85760,      85760,     1536,      418, cf52ea7fc69e4c5bc8f75b354dfe60af
-0,     100352,     100352,     2048,     1506, 74f01869f22e72e244f31e2da2614676
+0,     100352,     100352,     2048,     1423, f480272c7d0b97834bc8ea36cceca61d
 1,      87296,      87296,     1536,      418, 78ab22657a1b6c8a0e5b8612ceb8081d
diff --git a/tests/ref/fate/copy-shortest2 b/tests/ref/fate/copy-shortest2
index 6f5593fc15..69204b373a 100644
--- a/tests/ref/fate/copy-shortest2
+++ b/tests/ref/fate/copy-shortest2
@@ -1,7 +1,7 @@ 
 #format: frame checksums
 #version: 2
 #hash: MD5
-#extradata 0,                              30, 226f0a640065a7bbc3a3e6dd5067de5a
+#extradata 0,                              30, 0e11a510b0c7831954402f81dd258188
 #tb 0: 1/51200
 #media_type 0: video
 #codec_id 0: mpeg4
@@ -15,110 +15,110 @@ 
 #channel_layout_name 1: mono
 #stream#, dts,        pts, duration,     size, hash
 1,       -256,       -256,     1536,      416, e3bd415f62aa927e9273151fdf21ebce
-0,          0,          0,     2048,     8876, b18b95893443cf5840d5962ad3456e97
+0,          0,          0,     2048,     8719, bbea2a7487d61d39a0b2f2fe62a4df4a
 1,       1280,       1280,     1536,      418, 6e79527e2af3448d7a0e4a8e29cd9722
-0,       2048,       2048,     2048,     1025, 3c8f2dba6d80ebd4f656ecb772d46c9d
+0,       2048,       2048,     2048,      975, 94f30e410595452ee981d96224516504
 1,       2816,       2816,     1536,      418, cf49595ac385e497672e5a814f7bcd79
-0,       4096,       4096,     2048,     1226, 03470d542c38b78c48df45f19f2958e7
+0,       4096,       4096,     2048,     1167, d3b895191e8a06d19bbc8ac90e564b3b
 1,       4352,       4352,     1536,      418, 846982243d330ab782f0120988d52ade
-0,       6144,       6144,     2048,     1353, 51f123ef389e7ccb20d382ce779d81ed
+0,       6144,       6144,     2048,     1274, 272f548f13dd6a45a5cd187f0e43e635
 1,       5888,       5888,     1536,      418, 77b2d15948434a4831e30c47b8214591
-0,       8192,       8192,     2048,     1421, 19897f392cc3517485bc6acfed2c2e2f
+0,       8192,       8192,     2048,     1361, a0c67fc195fe867ae240dc8c48f85b2e
 1,       7424,       7424,     1536,      418, 4fce87d5cce10f6d0268fb398c385af5
-0,      10240,      10240,     2048,     1446, 6d5a5dc31d09c144fba37c4e569f6e35
+0,      10240,      10240,     2048,     1415, f7a3746adb348eb00042b3eccff54a87
 1,       8960,       8960,     1536,      418, 963f2dac9af4672809521f2174b78f10
 1,      10496,      10496,     1536,      418, eb7a20193c157b02f7b5d5abf802af24
-0,      12288,      12288,     2048,     1483, 299f60d66033bab84ee737c6056e8588
+0,      12288,      12288,     2048,     1421, 8396b1c23f7d39f6f73c3469826317d6
 1,      12032,      12032,     1536,      418, 219b234a1e01d3538bfe09fda58b3289
-0,      14336,      14336,     2048,     1494, 54759f501f33744e81a456b5e4d695f7
+0,      14336,      14336,     2048,     1474, a9c493c020d710af7f2c98b9aae846ff
 1,      13568,      13568,     1536,      418, ef7bd3e9c13f03aa6676629101a9a8a0
-0,      16384,      16384,     2048,     1552, 446661f8d2ee9b82c868cffb26160054
+0,      16384,      16384,     2048,     1467, b801d1a76c84923ab813e9a5d9ebdb78
 1,      15104,      15104,     1536,      418, c5dda974df7e418d9036dff134aad2ae
-0,      18432,      18432,     2048,     1521, 0db5cd946c19b1552eacf56901558e5c
+0,      18432,      18432,     2048,     1469, 22f7fcd055bf124436de9a9432f7c9d2
 1,      16640,      16640,     1536,      418, 48e7a9f574654dd95a325cfec5072254
-0,      20480,      20480,     2048,     1545, 725ac20d7c171e448dce01d660021118
+0,      20480,      20480,     2048,     1506, da18f30d7008f2307ec51863a9873afd
 1,      18176,      18176,     1536,      418, 737d867e328377a3e6623f77f646ea61
-0,      22528,      22528,     2048,     1556, 429e63d26b4b3b95b91547489e49293d
+0,      22528,      22528,     2048,     1520, 2c7d44ca3485373af6cfb3e44e495bf7
 1,      19712,      19712,     1536,      418, 5e2a004ad90ba069cecd9fdc1652388c
-0,      24576,      24576,     2048,     8659, fdf5109e322c9e5b80d9453a6ca4853d
+0,      24576,      24576,     2048,     8524, 0634c69955cbffe94f4e15b288557cac
 1,      21248,      21248,     1536,      418, c694e51e609bdd00749a04294cbd60fb
 1,      22784,      22784,     1536,      418, 6b787ffae0063d9910deebc8b3e98fd4
-0,      26624,      26624,     2048,     1144, 74ee1db0568ccf0c866189e59c8530cc
+0,      26624,      26624,     2048,     1079, f081cbd559dab2b579f40d2fa988a959
 1,      24320,      24320,     1536,      418, eb6d62198a5472a1c179d42cde60b869
-0,      28672,      28672,     2048,     1404, 9ddf9ceb0f25e54813f340c52b78a21f
+0,      28672,      28672,     2048,     1343, fdf8069cd511f4fa185748118acfb72e
 1,      25856,      25856,     1536,      418, 70a6c8e61e8d75f7a310bc7294ad38f6
-0,      30720,      30720,     2048,     1550, 52ca630df0df5d29a3d4d0133e746d39
+0,      30720,      30720,     2048,     1486, e72dfcd069f5be3a30310002b1b5e252
 1,      27392,      27392,     1536,      418, 6847924a11575b3628ccdfd81a2fb1dc
-0,      32768,      32768,     2048,     1549, d999030e465c63639d2c501180ef9f63
+0,      32768,      32768,     2048,     1491, 710c5421d44a8c9356c1477cbcd27c0e
 1,      28928,      28928,     1536,      418, 6f76bbe03d8b4e0080226247e0e54f96
-0,      34816,      34816,     2048,     1582, 2ea6009ba8964412d0be2286296eb255
+0,      34816,      34816,     2048,     1504, 16a6d624b8175f1191ede25e2d588b92
 1,      30464,      30464,     1536,      418, c946a8d690aa31fde929678b594cc432
-0,      36864,      36864,     2048,     1519, ba2c386a35843ce0bb25b4f5c17e2ee6
+0,      36864,      36864,     2048,     1481, 8696aa412629328687bda5e88dd40b81
 1,      32000,      32000,     1536,      418, 3add3833b86a38c229faf8e602f83dcb
-0,      38912,      38912,     2048,     1541, 34e3b4b5eb4ac0a0ab1fee2df6c38007
+0,      38912,      38912,     2048,     1521, 3c974bf799b8e35d295c6567ffeb7276
 1,      33536,      33536,     1536,      418, cb51e6a41f5c4a5f01dd94f58210112b
 1,      35072,      35072,     1536,      418, 66c3570cb8c11386b0601fe4a6eb7ee0
-0,      40960,      40960,     2048,     1578, f7c6d15a0de6088a1547d4be0898387f
+0,      40960,      40960,     2048,     1514, 1a54ec5296f1551a7f67c515e40ca646
 1,      36608,      36608,     1536,      418, 8b986c15b9ab86432c43cedd1a182e8d
-0,      43008,      43008,     2048,     1622, e568e8b1bf951006f7d025890b950e5d
+0,      43008,      43008,     2048,     1562, d285916a1c7a2fb9f37d18bfa977e075
 1,      38144,      38144,     1536,      418, 0dd29cc7f63f2afac3eec5e5944165e7
-0,      45056,      45056,     2048,     1611, a208ef59b6f176a78d6c9113df17cf3d
+0,      45056,      45056,     2048,     1562, 320c26adae1dad1741e02febdbd5b916
 1,      39680,      39680,     1536,      418, c4c14deb03d5048f8c6101260c617fae
-0,      47104,      47104,     2048,     1706, f298b1930c927839470258f50d456dc8
+0,      47104,      47104,     2048,     1629, 60c6ebd71f641ebcff9997ee338d82bf
 1,      41216,      41216,     1536,      418, 4a3480d888fa0dd49a7bbf2669b5d3ed
-0,      49152,      49152,     2048,     9737, 94e0e1fa27e7e57a956e0fc27670e5c8
+0,      49152,      49152,     2048,     9634, b72deda826b002179c46789e92c07978
 1,      42752,      42752,     1536,      418, aaeabe149b9185a6f09c271eb2c656dd
-0,      51200,      51200,     2048,     1323, 248d92526f1e6a0d5e7592b40ac213c0
+0,      51200,      51200,     2048,     1239, 407105508656c920761e60c90540ee18
 1,      44288,      44288,     1536,      418, 0995488ad1bb84ec4a3e738b568484a4
 1,      45824,      45824,     1536,      418, baa39bdfd9f47f7d312312985f59fb72
-0,      53248,      53248,     2048,     1621, 1ee6a5eb09be8ab281d05125c2868c56
+0,      53248,      53248,     2048,     1568, 1e5b232eaf9f35846ae25b881f658e5c
 1,      47360,      47360,     1536,      418, c25bac736a8c356d0a0f9c9299f88880
-0,      55296,      55296,     2048,     1698, db8b8ca03eca285d02dbce6eaaacdfd1
+0,      55296,      55296,     2048,     1641, f79725e348ed7796f2be7c153ce32580
 1,      48896,      48896,     1536,      418, 85378fd6c8b49a1f4c5490ab1e4013ca
-0,      57344,      57344,     2048,     1793, c50e4bdacb3ecef9c94be7b292929018
+0,      57344,      57344,     2048,     1735, ae14fbdbf8777d88077818db0ae346b3
 1,      50432,      50432,     1536,      418, 528e28031145f07336cd2a1b9b324ca6
-0,      59392,      59392,     2048,     1805, 1db64693c5ca5595b2f47097ffdfc612
+0,      59392,      59392,     2048,     1760, e943dc0f9ed56fbca1af43c3c3c6dea1
 1,      51968,      51968,     1536,      418, cc9b907fc92fffc61f7e41cdb863d586
-0,      61440,      61440,     2048,     1880, 9f96e1bc1f3b595d6cd626dced55416f
+0,      61440,      61440,     2048,     1798, efb1c91f9aee5c84c92e8cd5a5b58783
 1,      53504,      53504,     1536,      418, fe2f2ca279b14d7053349111578b48c0
-0,      63488,      63488,     2048,     1902, 209393253d103d83d8dddde7fe044953
+0,      63488,      63488,     2048,     1830, 7aa74080b344e63280854570f701e2b8
 1,      55040,      55040,     1536,      418, 5f2c6037aa4b89572a4ed712082ae2ab
-0,      65536,      65536,     2048,     1896, 9a845e06daafc1dd83d77fe507569968
+0,      65536,      65536,     2048,     1835, 566fa13f73b9aa63eed50511b112b191
 1,      56576,      56576,     1536,      418, 17a096694df972c2ef3a9abbe0a9cd6a
 1,      58112,      58112,     1536,      418, c96a64bbfd1aae269e44bfdaea7c8a9c
-0,      67584,      67584,     2048,     1954, 77c37124c545198b688518508299f5f8
+0,      67584,      67584,     2048,     1902, 95933f1710291419d0febd37d5878362
 1,      59648,      59648,     1536,      418, 5f9297244e107134c49fc4982f5a7c1f
-0,      69632,      69632,     2048,     1989, 0b142544ef59e421e33a40f9e685dffa
+0,      69632,      69632,     2048,     1886, 5a8e4c7557ec0d09d40fbfabc5b92e63
 1,      61184,      61184,     1536,      418, da740d2d75b51d6e28bcb068f6a90d41
-0,      71680,      71680,     2048,     2042, f69d73e0af0b4d9ef65205d8a0ee0937
+0,      71680,      71680,     2048,     1949, 3f81e2b8821c22f89501feafebb9d618
 1,      62720,      62720,     1536,      418, 76e6bbbbfa0692659d0d84a30dcfff34
-0,      73728,      73728,     2048,    10838, bd02df61e3f5c0aa572904220aaf04a6
+0,      73728,      73728,     2048,    10776, 29e4a6fdc625965feae7faa8ab239db1
 1,      64256,      64256,     1536,      418, 0bd304182f1693b18c46b0faa682b159
-0,      75776,      75776,     2048,     1511, 6ab5a58771e346bd8756fdd68139ad8e
+0,      75776,      75776,     2048,     1413, 4b5bde19c84eca2c776f6ac45163a0a5
 1,      65792,      65792,     1536,      418, ecf7bd4ba9161338ce2cefc1fdd06098
-0,      77824,      77824,     2048,     1780, 62e0bc487aa55ad381d0a1e7f8b7a477
+0,      77824,      77824,     2048,     1731, 7f46b3e146e52fd500dbf53a3c744662
 1,      67328,      67328,     1536,      418, 4953c0e441ca0ca2e1970b8b31d6c70e
-0,      79872,      79872,     2048,     1953, ad1854098648e499e347cf828202d1d5
+0,      79872,      79872,     2048,     1888, 2bd4182a0fe98db2990c8e39c0500872
 1,      68864,      68864,     1536,      418, 4eb7f24aa46b8f0e6b47d0ca6ec0d56d
 1,      70400,      70400,     1536,      418, df4d73a6acccd3be6663188f4baab996
-0,      81920,      81920,     2048,     2036, da8405d19586da34274a578f4972fd7f
+0,      81920,      81920,     2048,     1989, f3bf07391ef46cba98eb78fdc3707fa3
 1,      71936,      71936,     1536,      418, 5e60f266106b86f19749b64d86b11f43
-0,      83968,      83968,     2048,     1980, e046fca4a3652fad1b0b22e49a290dd8
+0,      83968,      83968,     2048,     1949, 0650751332acc5d5f96f292ffc4add21
 1,      73472,      73472,     1536,      418, cedea148c5f7ddba6f0fbcbe17e6bfbb
-0,      86016,      86016,     2048,     2014, 01806ec06d4cdb2b840a6f7993b648e3
+0,      86016,      86016,     2048,     1956, d52d57b697f4ec90bb1f69fd7ece1952
 1,      75008,      75008,     1536,      416, 97655498b413a59b3f0f6bdc25f69084
-0,      88064,      88064,     2048,     2040, 19c5cc70489711d467ef7ef4414fdf6a
+0,      88064,      88064,     2048,     2012, e25c0bb0ec726fe5c9ade88cf7ae9a19
 1,      76544,      76544,     1536,      418, 0bea3f23db7aafefe50710310af25a9b
-0,      90112,      90112,     2048,     2071, 2bc9f2d22ac276366337341e89efd6cb
+0,      90112,      90112,     2048,     1995, eb0377542bc15580ef8f772ce6f506bd
 1,      78080,      78080,     1536,      418, e763b383810d9a4645901c0d93f98a32
-0,      92160,      92160,     2048,     2117, 7173333f3ff643752b8afea6d5486117
+0,      92160,      92160,     2048,     2078, 7aa93cd366118984932da377f4743de6
 1,      79616,      79616,     1536,      418, f090bb15688066a9c5129348f86245e7
-0,      94208,      94208,     2048,     2169, fda9c958dc9fea54efa935624528a902
+0,      94208,      94208,     2048,     2116, 9d8c672e97c27ed4e3281bb10481914a
 1,      81152,      81152,     1536,      418, beb8658ede31b44326de936b28a2d740
 1,      82688,      82688,     1536,      418, 53987c0214550f387ce03093b83f4225
-0,      96256,      96256,     2048,     2096, 9516005a46f05f1a582524be91c4d672
+0,      96256,      96256,     2048,     2024, 18d42dbec2fa24fd30374d79a054cd4f
 1,      84224,      84224,     1536,      418, d3c37c202144070892528cc0a0ff3112
-0,      98304,      98304,     2048,    11219, 834f992165c0ee5e5a60fff78610b449
+0,      98304,      98304,     2048,    11182, e35a2ab846029effdbca0e43639717f2
 1,      85760,      85760,     1536,      418, cf52ea7fc69e4c5bc8f75b354dfe60af
-0,     100352,     100352,     2048,     1506, 74f01869f22e72e244f31e2da2614676
+0,     100352,     100352,     2048,     1423, f480272c7d0b97834bc8ea36cceca61d
 1,      87296,      87296,     1536,      418, 78ab22657a1b6c8a0e5b8612ceb8081d
diff --git a/tests/ref/fate/shortest b/tests/ref/fate/shortest
index d264955389..35e6f754e8 100644
--- a/tests/ref/fate/shortest
+++ b/tests/ref/fate/shortest
@@ -14,110 +14,110 @@ 
 #channel_layout_name 1: mono
 #stream#, dts,        pts, duration,     size, hash
 1,       -256,       -256,     1536,      416, e3bd415f62aa927e9273151fdf21ebce
-0,          0,          0,        1,     8906, dc889f5692ac7d91295c9fbae76a9818, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
+0,          0,          0,        1,     8749, 1ec6912eea4794cadf946a704e5f7630, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
 1,       1280,       1280,     1536,      418, 6e79527e2af3448d7a0e4a8e29cd9722
-0,          1,          1,        1,     1025, 3c8f2dba6d80ebd4f656ecb772d46c9d, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          1,          1,        1,      975, 94f30e410595452ee981d96224516504, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,       2816,       2816,     1536,      418, cf49595ac385e497672e5a814f7bcd79
-0,          2,          2,        1,     1226, 03470d542c38b78c48df45f19f2958e7, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          2,          2,        1,     1167, d3b895191e8a06d19bbc8ac90e564b3b, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,       4352,       4352,     1536,      418, 846982243d330ab782f0120988d52ade
-0,          3,          3,        1,     1353, 51f123ef389e7ccb20d382ce779d81ed, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          3,          3,        1,     1274, 272f548f13dd6a45a5cd187f0e43e635, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,       5888,       5888,     1536,      418, 77b2d15948434a4831e30c47b8214591
-0,          4,          4,        1,     1421, 19897f392cc3517485bc6acfed2c2e2f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          4,          4,        1,     1361, a0c67fc195fe867ae240dc8c48f85b2e, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,       7424,       7424,     1536,      418, 4fce87d5cce10f6d0268fb398c385af5
-0,          5,          5,        1,     1446, 6d5a5dc31d09c144fba37c4e569f6e35, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          5,          5,        1,     1415, f7a3746adb348eb00042b3eccff54a87, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,       8960,       8960,     1536,      418, 963f2dac9af4672809521f2174b78f10
 1,      10496,      10496,     1536,      418, eb7a20193c157b02f7b5d5abf802af24
-0,          6,          6,        1,     1483, 299f60d66033bab84ee737c6056e8588, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          6,          6,        1,     1421, 8396b1c23f7d39f6f73c3469826317d6, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      12032,      12032,     1536,      418, 219b234a1e01d3538bfe09fda58b3289
-0,          7,          7,        1,     1494, 54759f501f33744e81a456b5e4d695f7, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          7,          7,        1,     1474, a9c493c020d710af7f2c98b9aae846ff, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      13568,      13568,     1536,      418, ef7bd3e9c13f03aa6676629101a9a8a0
-0,          8,          8,        1,     1552, 446661f8d2ee9b82c868cffb26160054, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          8,          8,        1,     1467, b801d1a76c84923ab813e9a5d9ebdb78, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      15104,      15104,     1536,      418, c5dda974df7e418d9036dff134aad2ae
-0,          9,          9,        1,     1521, 0db5cd946c19b1552eacf56901558e5c, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,          9,          9,        1,     1469, 22f7fcd055bf124436de9a9432f7c9d2, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      16640,      16640,     1536,      418, 48e7a9f574654dd95a325cfec5072254
-0,         10,         10,        1,     1545, 725ac20d7c171e448dce01d660021118, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         10,         10,        1,     1506, da18f30d7008f2307ec51863a9873afd, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      18176,      18176,     1536,      418, 737d867e328377a3e6623f77f646ea61
-0,         11,         11,        1,     1556, 429e63d26b4b3b95b91547489e49293d, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         11,         11,        1,     1520, 2c7d44ca3485373af6cfb3e44e495bf7, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      19712,      19712,     1536,      418, 5e2a004ad90ba069cecd9fdc1652388c
-0,         12,         12,        1,     8689, 710c00d071339e873215f0c8b58cab0b, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
+0,         12,         12,        1,     8554, ed7ebf3329b277266579e171897c7223, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
 1,      21248,      21248,     1536,      418, c694e51e609bdd00749a04294cbd60fb
 1,      22784,      22784,     1536,      418, 6b787ffae0063d9910deebc8b3e98fd4
-0,         13,         13,        1,     1144, 74ee1db0568ccf0c866189e59c8530cc, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         13,         13,        1,     1079, f081cbd559dab2b579f40d2fa988a959, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      24320,      24320,     1536,      418, eb6d62198a5472a1c179d42cde60b869
-0,         14,         14,        1,     1404, 9ddf9ceb0f25e54813f340c52b78a21f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         14,         14,        1,     1343, fdf8069cd511f4fa185748118acfb72e, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      25856,      25856,     1536,      418, 70a6c8e61e8d75f7a310bc7294ad38f6
-0,         15,         15,        1,     1550, 52ca630df0df5d29a3d4d0133e746d39, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         15,         15,        1,     1486, e72dfcd069f5be3a30310002b1b5e252, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      27392,      27392,     1536,      418, 6847924a11575b3628ccdfd81a2fb1dc
-0,         16,         16,        1,     1549, d999030e465c63639d2c501180ef9f63, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         16,         16,        1,     1491, 710c5421d44a8c9356c1477cbcd27c0e, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      28928,      28928,     1536,      418, 6f76bbe03d8b4e0080226247e0e54f96
-0,         17,         17,        1,     1582, 2ea6009ba8964412d0be2286296eb255, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         17,         17,        1,     1504, 16a6d624b8175f1191ede25e2d588b92, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      30464,      30464,     1536,      418, c946a8d690aa31fde929678b594cc432
-0,         18,         18,        1,     1519, ba2c386a35843ce0bb25b4f5c17e2ee6, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         18,         18,        1,     1481, 8696aa412629328687bda5e88dd40b81, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      32000,      32000,     1536,      418, 3add3833b86a38c229faf8e602f83dcb
-0,         19,         19,        1,     1541, 34e3b4b5eb4ac0a0ab1fee2df6c38007, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         19,         19,        1,     1521, 3c974bf799b8e35d295c6567ffeb7276, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      33536,      33536,     1536,      418, cb51e6a41f5c4a5f01dd94f58210112b
 1,      35072,      35072,     1536,      418, 66c3570cb8c11386b0601fe4a6eb7ee0
-0,         20,         20,        1,     1578, f7c6d15a0de6088a1547d4be0898387f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         20,         20,        1,     1514, 1a54ec5296f1551a7f67c515e40ca646, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      36608,      36608,     1536,      418, 8b986c15b9ab86432c43cedd1a182e8d
-0,         21,         21,        1,     1622, e568e8b1bf951006f7d025890b950e5d, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         21,         21,        1,     1562, d285916a1c7a2fb9f37d18bfa977e075, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      38144,      38144,     1536,      418, 0dd29cc7f63f2afac3eec5e5944165e7
-0,         22,         22,        1,     1611, a208ef59b6f176a78d6c9113df17cf3d, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         22,         22,        1,     1562, 320c26adae1dad1741e02febdbd5b916, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      39680,      39680,     1536,      418, c4c14deb03d5048f8c6101260c617fae
-0,         23,         23,        1,     1706, f298b1930c927839470258f50d456dc8, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         23,         23,        1,     1629, 60c6ebd71f641ebcff9997ee338d82bf, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      41216,      41216,     1536,      418, 4a3480d888fa0dd49a7bbf2669b5d3ed
-0,         24,         24,        1,     9767, 9a4cf29909201c67bf40238efdf65d19, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
+0,         24,         24,        1,     9664, e42d4bb6f613370b1a9ef4554e58f65e, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
 1,      42752,      42752,     1536,      418, aaeabe149b9185a6f09c271eb2c656dd
-0,         25,         25,        1,     1323, 248d92526f1e6a0d5e7592b40ac213c0, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         25,         25,        1,     1239, 407105508656c920761e60c90540ee18, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      44288,      44288,     1536,      418, 0995488ad1bb84ec4a3e738b568484a4
 1,      45824,      45824,     1536,      418, baa39bdfd9f47f7d312312985f59fb72
-0,         26,         26,        1,     1621, 1ee6a5eb09be8ab281d05125c2868c56, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         26,         26,        1,     1568, 1e5b232eaf9f35846ae25b881f658e5c, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      47360,      47360,     1536,      418, c25bac736a8c356d0a0f9c9299f88880
-0,         27,         27,        1,     1698, db8b8ca03eca285d02dbce6eaaacdfd1, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         27,         27,        1,     1641, f79725e348ed7796f2be7c153ce32580, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      48896,      48896,     1536,      418, 85378fd6c8b49a1f4c5490ab1e4013ca
-0,         28,         28,        1,     1793, c50e4bdacb3ecef9c94be7b292929018, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         28,         28,        1,     1735, ae14fbdbf8777d88077818db0ae346b3, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      50432,      50432,     1536,      418, 528e28031145f07336cd2a1b9b324ca6
-0,         29,         29,        1,     1805, 1db64693c5ca5595b2f47097ffdfc612, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         29,         29,        1,     1760, e943dc0f9ed56fbca1af43c3c3c6dea1, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      51968,      51968,     1536,      418, cc9b907fc92fffc61f7e41cdb863d586
-0,         30,         30,        1,     1880, 9f96e1bc1f3b595d6cd626dced55416f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         30,         30,        1,     1798, efb1c91f9aee5c84c92e8cd5a5b58783, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      53504,      53504,     1536,      418, fe2f2ca279b14d7053349111578b48c0
-0,         31,         31,        1,     1902, 209393253d103d83d8dddde7fe044953, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         31,         31,        1,     1830, 7aa74080b344e63280854570f701e2b8, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      55040,      55040,     1536,      418, 5f2c6037aa4b89572a4ed712082ae2ab
-0,         32,         32,        1,     1896, 9a845e06daafc1dd83d77fe507569968, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         32,         32,        1,     1835, 566fa13f73b9aa63eed50511b112b191, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      56576,      56576,     1536,      418, 17a096694df972c2ef3a9abbe0a9cd6a
 1,      58112,      58112,     1536,      418, c96a64bbfd1aae269e44bfdaea7c8a9c
-0,         33,         33,        1,     1954, 77c37124c545198b688518508299f5f8, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         33,         33,        1,     1902, 95933f1710291419d0febd37d5878362, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      59648,      59648,     1536,      418, 5f9297244e107134c49fc4982f5a7c1f
-0,         34,         34,        1,     1989, 0b142544ef59e421e33a40f9e685dffa, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         34,         34,        1,     1886, 5a8e4c7557ec0d09d40fbfabc5b92e63, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      61184,      61184,     1536,      418, da740d2d75b51d6e28bcb068f6a90d41
-0,         35,         35,        1,     2042, f69d73e0af0b4d9ef65205d8a0ee0937, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         35,         35,        1,     1949, 3f81e2b8821c22f89501feafebb9d618, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      62720,      62720,     1536,      418, 76e6bbbbfa0692659d0d84a30dcfff34
-0,         36,         36,        1,    10868, 2f4b959d1dc05a1d7e00cbe204b5fc2d, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
+0,         36,         36,        1,    10806, 40b9971c54416684ebaf3c1f59be30e6, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
 1,      64256,      64256,     1536,      418, 0bd304182f1693b18c46b0faa682b159
-0,         37,         37,        1,     1511, 6ab5a58771e346bd8756fdd68139ad8e, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         37,         37,        1,     1413, 4b5bde19c84eca2c776f6ac45163a0a5, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      65792,      65792,     1536,      418, ecf7bd4ba9161338ce2cefc1fdd06098
-0,         38,         38,        1,     1780, 62e0bc487aa55ad381d0a1e7f8b7a477, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         38,         38,        1,     1731, 7f46b3e146e52fd500dbf53a3c744662, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      67328,      67328,     1536,      418, 4953c0e441ca0ca2e1970b8b31d6c70e
-0,         39,         39,        1,     1953, ad1854098648e499e347cf828202d1d5, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         39,         39,        1,     1888, 2bd4182a0fe98db2990c8e39c0500872, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      68864,      68864,     1536,      418, 4eb7f24aa46b8f0e6b47d0ca6ec0d56d
 1,      70400,      70400,     1536,      418, df4d73a6acccd3be6663188f4baab996
-0,         40,         40,        1,     2036, da8405d19586da34274a578f4972fd7f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         40,         40,        1,     1989, f3bf07391ef46cba98eb78fdc3707fa3, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      71936,      71936,     1536,      418, 5e60f266106b86f19749b64d86b11f43
-0,         41,         41,        1,     1980, e046fca4a3652fad1b0b22e49a290dd8, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         41,         41,        1,     1949, 0650751332acc5d5f96f292ffc4add21, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      73472,      73472,     1536,      418, cedea148c5f7ddba6f0fbcbe17e6bfbb
-0,         42,         42,        1,     2014, 01806ec06d4cdb2b840a6f7993b648e3, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         42,         42,        1,     1956, d52d57b697f4ec90bb1f69fd7ece1952, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      75008,      75008,     1536,      416, 97655498b413a59b3f0f6bdc25f69084
-0,         43,         43,        1,     2040, 19c5cc70489711d467ef7ef4414fdf6a, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         43,         43,        1,     2012, e25c0bb0ec726fe5c9ade88cf7ae9a19, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      76544,      76544,     1536,      418, 0bea3f23db7aafefe50710310af25a9b
-0,         44,         44,        1,     2071, 2bc9f2d22ac276366337341e89efd6cb, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         44,         44,        1,     1995, eb0377542bc15580ef8f772ce6f506bd, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      78080,      78080,     1536,      418, e763b383810d9a4645901c0d93f98a32
-0,         45,         45,        1,     2117, 7173333f3ff643752b8afea6d5486117, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         45,         45,        1,     2078, 7aa93cd366118984932da377f4743de6, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      79616,      79616,     1536,      418, f090bb15688066a9c5129348f86245e7
-0,         46,         46,        1,     2169, fda9c958dc9fea54efa935624528a902, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         46,         46,        1,     2116, 9d8c672e97c27ed4e3281bb10481914a, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      81152,      81152,     1536,      418, beb8658ede31b44326de936b28a2d740
 1,      82688,      82688,     1536,      418, 53987c0214550f387ce03093b83f4225
-0,         47,         47,        1,     2096, 9516005a46f05f1a582524be91c4d672, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         47,         47,        1,     2024, 18d42dbec2fa24fd30374d79a054cd4f, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      84224,      84224,     1536,      418, d3c37c202144070892528cc0a0ff3112
-0,         48,         48,        1,    11249, 36825ee3b6f996a93b1031bd1106586a, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
+0,         48,         48,        1,    11212, 68733811262acfc2d1772ba6d1c73344, S=1,        8, 438432f07a4fcc01dd57de0bf46d9acb
 1,      85760,      85760,     1536,      418, cf52ea7fc69e4c5bc8f75b354dfe60af
-0,         49,         49,        1,     1506, 74f01869f22e72e244f31e2da2614676, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
+0,         49,         49,        1,     1423, f480272c7d0b97834bc8ea36cceca61d, S=1,        8, f6ebfc548ad9ba3d00b655047277212d
 1,      87296,      87296,     1536,      418, 78ab22657a1b6c8a0e5b8612ceb8081d