adpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference.

5 files changed, 144 insertions, 144 deletions

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 54c3e6d194..3610a58812 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -448,7 +448,7 @@ static int get_nb_samples(AVCodecContext *avctx, const uint8_t *buf,
     case CODEC_ID_ADPCM_IMA_DK3:
         if (avctx->block_align > 0)
             buf_size = FFMIN(buf_size, avctx->block_align);
-        nb_samples = ((buf_size - 16) * 8 / 3) / ch;
+        nb_samples = ((buf_size - 16) * 2 / 3 * 4) / ch;
         break;
     case CODEC_ID_ADPCM_IMA_DK4:
         nb_samples = 1 + (buf_size - 4 * ch) * 2 / ch;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 20e9687c9b..fc48f029f6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1859,7 +1859,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
                 case CODEC_ID_ADPCM_IMA_WAV:
                     return blocks * (1 + (ba - 4 * ch) / (4 * ch) * 8);
                 case CODEC_ID_ADPCM_IMA_DK3:
-                    return blocks * (((ba - 16) * 8 / 3) / ch);
+                    return blocks * (((ba - 16) * 2 / 3 * 4) / ch);
                 case CODEC_ID_ADPCM_IMA_DK4:
                     return blocks * (1 + (ba - 4 * ch) * 2 / ch);
                 case CODEC_ID_ADPCM_MS:
diff --git a/tests/ref/fate/adpcm-ima-dk3 b/tests/ref/fate/adpcm-ima-dk3
index 9aad92beed..08c0fd1909 100644
--- a/tests/ref/fate/adpcm-ima-dk3
+++ b/tests/ref/fate/adpcm-ima-dk3
@@ -1 +1 @@
-bb952ae86c72d461aef7583685ec0a4d
+62fbe4db4a49cb044f57f92cce9993c5
diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/truemotion1-15
index ebffc6e830..c4efe8c47f 100644
--- a/tests/ref/fate/truemotion1-15
+++ b/tests/ref/fate/truemotion1-15
@@ -1,220 +1,220 @@
 #tb 0: 1/15
 #tb 1: 1/44100
 0,          0,          0,        1,   161280, 0x7041748d
-1,          0,          0,     2709,    10836, 0x2a531236
-1,       2709,       2709,     2709,    10836, 0xc58f45af
+1,          0,          0,     2708,    10832, 0xe1a811fa
+1,       2708,       2708,     2708,    10832, 0xb47841f9
 0,          1,          1,        1,   161280, 0x3cc4dfb5
-1,       5418,       5418,     2709,    10836, 0x436cf135
+1,       5416,       5416,     2708,    10832, 0x839eedf1
 0,          2,          2,        1,   161280, 0xca3af22d
-1,       8127,       8127,     2709,    10836, 0x3a6022cc
+1,       8124,       8124,     2708,    10832, 0xb48b1f60
 0,          3,          3,        1,   161280, 0x23ad1d85
-1,      10836,      10836,     2709,    10836, 0x57e83a4a
+1,      10832,      10832,     2708,    10832, 0x743936c0
 0,          4,          4,        1,   161280, 0x9c9cf364
-1,      13545,      13545,     2709,    10836, 0xca4b3a1b
+1,      13540,      13540,     2708,    10832, 0xe1f039fb
 0,          5,          5,        1,   161280, 0x1551d6a8
-1,      16254,      16254,     2709,    10836, 0xc3da7536
+1,      16248,      16248,     2708,    10832, 0xef00751a
 0,          6,          6,        1,   161280, 0xc39f6b95
-1,      18963,      18963,     2709,    10836, 0x8c57d47b
+1,      18956,      18956,     2708,    10832, 0x401ed099
 0,          7,          7,        1,   161280, 0x3b036dcc
-1,      21672,      21672,     2709,    10836, 0x9a79572b
+1,      21664,      21664,     2708,    10832, 0x432a53bd
 0,          8,          8,        1,   161280, 0xa6fac1db
-1,      24381,      24381,     2709,    10836, 0x7dbd6fd3
+1,      24372,      24372,     2708,    10832, 0xc4276bfd
 0,          9,          9,        1,   161280, 0x67656b62
-1,      27090,      27090,     2709,    10836, 0x4454fdde
+1,      27080,      27080,     2708,    10832, 0x51f0fa8c
 0,         10,         10,        1,   161280, 0xb41f47d1
-1,      29799,      29799,     2709,    10836, 0x68aae686
+1,      29788,      29788,     2708,    10832, 0xcebae622
 0,         11,         11,        1,   161280, 0xc207249e
-1,      32508,      32508,     2709,    10836, 0x61f2df35
-1,      35217,      35217,     2709,    10836, 0xe36883c6
+1,      32496,      32496,     2708,    10832, 0xe9f6dc1f
+1,      35204,      35204,     2708,    10832, 0xda087fee
 0,         12,         12,        1,   161280, 0xbee8f843
-1,      37926,      37926,     2709,    10836, 0xefa62217
+1,      37912,      37912,     2708,    10832, 0x67a621bb
 0,         13,         13,        1,   161280, 0x092acf46
-1,      40635,      40635,     2709,    10836, 0x63b92479
+1,      40620,      40620,     2708,    10832, 0xd7be207f
 0,         14,         14,        1,   161280, 0x8d9e2680
-1,      43344,      43344,     2709,    10836, 0xaf452579
+1,      43328,      43328,     2708,    10832, 0x19d32507
 0,         15,         15,        1,   161280, 0x8becc20c
-1,      46053,      46053,     2709,    10836, 0xdbb10001
+1,      46036,      46036,     2708,    10832, 0xe1a3fbfa
 0,         16,         16,        1,   161280, 0x655e444e
-1,      48762,      48762,     2709,    10836, 0xafb7f7a7
+1,      48744,      48744,     2708,    10832, 0xd10df779
 0,         17,         17,        1,   161280, 0x5c112da0
-1,      51471,      51471,     2709,    10836, 0xd4b1e591
+1,      51452,      51452,     2708,    10832, 0x4428e1a7
 0,         18,         18,        1,   161280, 0x232fa9eb
-1,      54180,      54180,     2709,    10836, 0x4d44b3bb
+1,      54160,      54160,     2708,    10832, 0x7ea9b33d
 0,         19,         19,        1,   161280, 0x9721745d
-1,      56889,      56889,     2709,    10836, 0xff2ea5b3
+1,      56868,      56868,     2708,    10832, 0x6852a5a5
 0,         20,         20,        1,   161280, 0x92f1d880
-1,      59598,      59598,     2709,    10836, 0x214e88ad
+1,      59576,      59576,     2708,    10832, 0xfeb78863
 0,         21,         21,        1,   161280, 0x16233978
-1,      62307,      62307,     2709,    10836, 0xde8bfc9a
+1,      62284,      62284,     2708,    10832, 0xf157f928
 0,         22,         22,        1,   161280, 0x19a27e69
-1,      65016,      65016,     2709,    10836, 0xb3cc4b6a
+1,      64992,      64992,     2708,    10832, 0x86414b3e
 0,         23,         23,        1,   161280, 0x7b6ad73a
-1,      67725,      67725,     2709,    10836, 0x670bce40
-1,      70434,      70434,     2709,    10836, 0xc17d31b2
+1,      67700,      67700,     2708,    10832, 0x2e28cdf6
+1,      70408,      70408,     2708,    10832, 0x00212e44
 0,         24,         24,        1,   161280, 0xa7a674aa
-1,      73143,      73143,     2709,    10836, 0x7bcb9392
+1,      73116,      73116,     2708,    10832, 0x2d7f9378
 0,         25,         25,        1,   161280, 0x4e434abb
-1,      75852,      75852,     2709,    10836, 0x230e28c9
+1,      75824,      75824,     2708,    10832, 0x84cb25d7
 0,         26,         26,        1,   161280, 0xb96eea14
-1,      78561,      78561,     2709,    10836, 0x42df4204
+1,      78532,      78532,     2708,    10832, 0x3aca41fa
 0,         27,         27,        1,   161280, 0x1350188c
-1,      81270,      81270,     2709,    10836, 0xfa9134b9
+1,      81240,      81240,     2708,    10832, 0x27ad34b9
 0,         28,         28,        1,   161280, 0x79c6f305
-1,      83979,      83979,     2709,    10836, 0x418c1844
+1,      83948,      83948,     2708,    10832, 0xe665144a
 0,         29,         29,        1,   161280, 0xa9c7782d
-1,      86688,      86688,     2709,    10836, 0x93ba66b6
+1,      86656,      86656,     2708,    10832, 0xf9546626
 0,         30,         30,        1,   161280, 0x40a4f456
-1,      89397,      89397,     2709,    10836, 0x264a4ffa
+1,      89364,      89364,     2708,    10832, 0xe71c4f22
 0,         31,         31,        1,   161280, 0xaf291ed6
-1,      92106,      92106,     2709,    10836, 0x82c78a8e
+1,      92072,      92072,     2708,    10832, 0x5e61869c
 0,         32,         32,        1,   161280, 0xab29b4e1
-1,      94815,      94815,     2709,    10836, 0x10d22fdc
+1,      94780,      94780,     2708,    10832, 0x571d2c10
 0,         33,         33,        1,   161280, 0xbfcd2712
-1,      97524,      97524,     2709,    10836, 0x2d25906b
+1,      97488,      97488,     2708,    10832, 0xf0e08cd5
 0,         34,         34,        1,   161280, 0xff22a0d7
-1,     100233,     100233,     2709,    10836, 0xa8a111fb
+1,     100196,     100196,     2708,    10832, 0x66650e49
 0,         35,         35,        1,   161280, 0xb0ae88a9
-1,     102942,     102942,     2709,    10836, 0xbd95df87
-1,     105651,     105651,     2709,    10836, 0x500ddec0
+1,     102904,     102904,     2708,    10832, 0x4024deaf
+1,     105612,     105612,     2708,    10832, 0xda7bdb14
 0,         36,         36,        1,   161280, 0x811d1259
-1,     108360,     108360,     2709,    10836, 0x95d9350b
+1,     108320,     108320,     2708,    10832, 0xc27a342f
 0,         37,         37,        1,   161280, 0x593c39a1
-1,     111069,     111069,     2709,    10836, 0xfa54ea1f
+1,     111028,     111028,     2708,    10832, 0x574fe679
 0,         38,         38,        1,   161280, 0x5a5a97f8
-1,     113778,     113778,     2709,    10836, 0x51b2467e
+1,     113736,     113736,     2708,    10832, 0x37db464e
 0,         39,         39,        1,   161280, 0xa5639ecf
-1,     116487,     116487,     2709,    10836, 0x5d772af9
+1,     116444,     116444,     2708,    10832, 0xb1fa2a83
 0,         40,         40,        1,   161280, 0x543920c6
-1,     119196,     119196,     2709,    10836, 0xae25dd8d
+1,     119152,     119152,     2708,    10832, 0x3d98d9b7
 0,         41,         41,        1,   161280, 0xb41689ee
-1,     121905,     121905,     2709,    10836, 0xe4bd0cb0
+1,     121860,     121860,     2708,    10832, 0xb7c908e2
 0,         42,         42,        1,   161280, 0xc0ad83de
-1,     124614,     124614,     2709,    10836, 0xb33544f0
+1,     124568,     124568,     2708,    10832, 0x9f7e44d8
 0,         43,         43,        1,   161280, 0x9e9e7456
-1,     127323,     127323,     2709,    10836, 0xd5658b12
+1,     127276,     127276,     2708,    10832, 0xae9b8774
 0,         44,         44,        1,   161280, 0x777ccbfe
-1,     130032,     130032,     2709,    10836, 0xeff66e5d
+1,     129984,     129984,     2708,    10832, 0x36916e3f
 0,         45,         45,        1,   161280, 0x9c2df916
-1,     132741,     132741,     2709,    10836, 0xb1fff6c5
+1,     132692,     132692,     2708,    10832, 0xd785f5ef
 0,         46,         46,        1,   161280, 0xe0c13b35
-1,     135450,     135450,     2709,    10836, 0x84db56b5
-1,     138159,     138159,     2709,    10836, 0x0230e3c9
+1,     135400,     135400,     2708,    10832, 0x2a3a5673
+1,     138108,     138108,     2708,    10832, 0x7320e379
 0,         47,         47,        1,   161280, 0x39bfa5a5
-1,     140868,     140868,     2709,    10836, 0xe58a7faf
+1,     140816,     140816,     2708,    10832, 0xec787be5
 0,         48,         48,        1,   161280, 0x35dfb264
-1,     143577,     143577,     2709,    10836, 0xc4003e2a
+1,     143524,     143524,     2708,    10832, 0xd0d13aa0
 0,         49,         49,        1,   161280, 0x43018613
-1,     146286,     146286,     2709,    10836, 0x6360cbbf
+1,     146232,     146232,     2708,    10832, 0x34dfcb17
 0,         50,         50,        1,   161280, 0x43584b8a
-1,     148995,     148995,     2709,    10836, 0xc29c2a05
+1,     148940,     148940,     2708,    10832, 0x1a9c29f1
 0,         51,         51,        1,   161280, 0xa5cd230a
-1,     151704,     151704,     2709,    10836, 0xb294dd11
+1,     151648,     151648,     2708,    10832, 0x3e73dcc1
 0,         52,         52,        1,   161280, 0x6fe2cfb3
-1,     154413,     154413,     2709,    10836, 0x4388b43b
+1,     154356,     154356,     2708,    10832, 0x7855b053
 0,         53,         53,        1,   161280, 0x88a7c0db
-1,     157122,     157122,     2709,    10836, 0xdd7be367
+1,     157064,     157064,     2708,    10832, 0x5588df8f
 0,         54,         54,        1,   161280, 0x476f1cd2
-1,     159831,     159831,     2709,    10836, 0xb9f612a9
+1,     159772,     159772,     2708,    10832, 0x6f621299
 0,         55,         55,        1,   161280, 0x96401d49
-1,     162540,     162540,     2709,    10836, 0xb64a39fe
+1,     162480,     162480,     2708,    10832, 0xce7f39c2
 0,         56,         56,        1,   161280, 0x7d932919
-1,     165249,     165249,     2709,    10836, 0x6eba6594
+1,     165188,     165188,     2708,    10832, 0xd88e6552
 0,         57,         57,        1,   161280, 0x06465481
-1,     167958,     167958,     2709,    10836, 0xb4af35c1
+1,     167896,     167896,     2708,    10832, 0xddc63597
 0,         58,         58,        1,   161280, 0x39631520
-1,     170667,     170667,     2709,    10836, 0x4e581c49
-1,     173376,     173376,     2709,    10836, 0xb062a19f
+1,     170604,     170604,     2708,    10832, 0xe3071865
+1,     173312,     173312,     2708,    10832, 0x2a44a123
 0,         59,         59,        1,   161280, 0xc3fff780
-1,     176085,     176085,     2709,    10836, 0x87cd6135
+1,     176020,     176020,     2708,    10832, 0x08d85d45
 0,         60,         60,        1,   161280, 0xa81faf28
-1,     178794,     178794,     2709,    10836, 0x37bffbd6
+1,     178728,     178728,     2708,    10832, 0x4dc5f83a
 0,         61,         61,        1,   161280, 0x7a311f4f
-1,     181503,     181503,     2709,    10836, 0x6c797900
+1,     181436,     181436,     2708,    10832, 0x89497812
 0,         62,         62,        1,   161280, 0x52f9b931
-1,     184212,     184212,     2709,    10836, 0x1615df36
+1,     184144,     184144,     2708,    10832, 0x9ee1db54
 0,         63,         63,        1,   161280, 0x938cf016
-1,     186921,     186921,     2709,    10836, 0xb472d9e9
+1,     186852,     186852,     2708,    10832, 0x5277d611
 0,         64,         64,        1,   161280, 0xf8f6e19c
-1,     189630,     189630,     2709,    10836, 0xdfff626e
+1,     189560,     189560,     2708,    10832, 0x570a619c
 0,         65,         65,        1,   161280, 0xca90561b
-1,     192339,     192339,     2709,    10836, 0xffa6d771
+1,     192268,     192268,     2708,    10832, 0xa217d70f
 0,         66,         66,        1,   161280, 0x8594d06b
-1,     195048,     195048,     2709,    10836, 0xa7f3cf96
+1,     194976,     194976,     2708,    10832, 0x6f0ecbf4
 0,         67,         67,        1,   161280, 0xea32bf3b
-1,     197757,     197757,     2709,    10836, 0xf556b50a
+1,     197684,     197684,     2708,    10832, 0x2704b114
 0,         68,         68,        1,   161280, 0x4646111a
-1,     200466,     200466,     2709,    10836, 0x99b86b39
+1,     200392,     200392,     2708,    10832, 0xf24e679f
 0,         69,         69,        1,   161280, 0xee891162
-1,     203175,     203175,     2709,    10836, 0x886920d3
+1,     203100,     203100,     2708,    10832, 0x05572099
 0,         70,         70,        1,   161280, 0xcfc32082
-1,     205884,     205884,     2709,    10836, 0xefb0305a
-1,     208593,     208593,     2709,    10836, 0x4ab7aa32
+1,     205808,     205808,     2708,    10832, 0x33942d0c
+1,     208516,     208516,     2708,    10832, 0xa77ea674
 0,         71,         71,        1,   161280, 0x863c281a
-1,     211302,     211302,     2709,    10836, 0x7f106530
+1,     211224,     211224,     2708,    10832, 0xeba663bc
 0,         72,         72,        1,   161280, 0x01b591aa
-1,     214011,     214011,     2709,    10836, 0x6461559a
+1,     213932,     213932,     2708,    10832, 0x1338524a
 0,         73,         73,        1,   161280, 0x211fbc62
-1,     216720,     216720,     2709,    10836, 0x25e3b12b
+1,     216640,     216640,     2708,    10832, 0x6182b0b3
 0,         74,         74,        1,   161280, 0xae2bafe2
-1,     219429,     219429,     2709,    10836, 0x32cfa3ba
+1,     219348,     219348,     2708,    10832, 0xa410a364
 0,         75,         75,        1,   161280, 0xcfe46dca
-1,     222138,     222138,     2709,    10836, 0x0bff78a4
+1,     222056,     222056,     2708,    10832, 0x2f4374b0
 0,         76,         76,        1,   161280, 0xcf8fe8a3
-1,     224847,     224847,     2709,    10836, 0xe4323d53
+1,     224764,     224764,     2708,    10832, 0xf41f3a07
 0,         77,         77,        1,   161280, 0x3f8474eb
-1,     227556,     227556,     2709,    10836, 0x70b35196
+1,     227472,     227472,     2708,    10832, 0x2b1c50c6
 0,         78,         78,        1,   161280, 0x06da345a
-1,     230265,     230265,     2709,    10836, 0xf2b8b07f
+1,     230180,     230180,     2708,    10832, 0x3692ac89
 0,         79,         79,        1,   161280, 0xbd4d3280
-1,     232974,     232974,     2709,    10836, 0x826cc972
+1,     232888,     232888,     2708,    10832, 0x5d6bc87e
 0,         80,         80,        1,   161280, 0xb5e70fea
-1,     235683,     235683,     2709,    10836, 0x8a0fdce8
+1,     235596,     235596,     2708,    10832, 0x1b1cda0c
 0,         81,         81,        1,   161280, 0x0c99c804
-1,     238392,     238392,     2709,    10836, 0xa072a503
+1,     238304,     238304,     2708,    10832, 0x11eaa15f
+1,     241012,     241012,     2708,    10832, 0x73c7d7ef
 0,         82,         82,        1,   161280, 0x19841ed4
-1,     241101,     241101,     2709,    10836, 0xd698d8e7
-1,     243810,     243810,     2709,    10836, 0xfe80e794
+1,     243720,     243720,     2708,    10832, 0x65d7e3be
 0,         83,         83,        1,   161280, 0xf81dea50
-1,     246519,     246519,     2709,    10836, 0xdd580a5a
+1,     246428,     246428,     2708,    10832, 0xb9c00688
 0,         84,         84,        1,   161280, 0x7777d81c
-1,     249228,     249228,     2709,    10836, 0x121bc1bb
+1,     249136,     249136,     2708,    10832, 0x0b98c125
 0,         85,         85,        1,   161280, 0x0497cfd8
-1,     251937,     251937,     2709,    10836, 0x8cebd7d9
+1,     251844,     251844,     2708,    10832, 0x331ed413
 0,         86,         86,        1,   161280, 0x50b6eb64
-1,     254646,     254646,     2709,    10836, 0x6eaef4d7
+1,     254552,     254552,     2708,    10832, 0x9b68f485
 0,         87,         87,        1,   161280, 0x5071fc07
-1,     257355,     257355,     2709,    10836, 0x8f0b5d0b
+1,     257260,     257260,     2708,    10832, 0x1b865c55
 0,         88,         88,        1,   161280, 0xbb7527fb
-1,     260064,     260064,     2709,    10836, 0x40ccf61f
+1,     259968,     259968,     2708,    10832, 0x68cef565
 0,         89,         89,        1,   161280, 0x13054f1f
-1,     262773,     262773,     2709,    10836, 0xb6db5f1d
+1,     262676,     262676,     2708,    10832, 0x3a605f15
 0,         90,         90,        1,   161280, 0x4b78fb27
-1,     265482,     265482,     2709,    10836, 0xa089f250
+1,     265384,     265384,     2708,    10832, 0xd72ff22e
 0,         91,         91,        1,   161280, 0xf504968f
-1,     268191,     268191,     2709,    10836, 0xd3512f2b
+1,     268092,     268092,     2708,    10832, 0x1c672b67
 0,         92,         92,        1,   161280, 0x555b10b7
-1,     270900,     270900,     2709,    10836, 0xfa127f74
+1,     270800,     270800,     2708,    10832, 0xfd1a7e7e
 0,         93,         93,        1,   161280, 0xcc0dde40
-1,     273609,     273609,     2709,    10836, 0xd6a60ead
-1,     276318,     276318,     2709,    10836, 0x00000000
+1,     273508,     273508,     2708,    10832, 0x9bf20ead
+1,     276216,     276216,     2708,    10832, 0x00000000
 0,         94,         94,        1,   161280, 0xcc0dde40
-1,     279027,     279027,     2709,    10836, 0x00000000
+1,     278924,     278924,     2708,    10832, 0x00000000
 0,         95,         95,        1,   161280, 0x367f60c8
-1,     281736,     281736,     2709,    10836, 0x00000000
+1,     281632,     281632,     2708,    10832, 0x00000000
 0,         96,         96,        1,   161280, 0x367f60c8
-1,     284445,     284445,     2709,    10836, 0x00000000
+1,     284340,     284340,     2708,    10832, 0x00000000
 0,         97,         97,        1,   161280, 0x367f60c8
-1,     287154,     287154,     2709,    10836, 0x00000000
+1,     287048,     287048,     2708,    10832, 0x00000000
 0,         98,         98,        1,   161280, 0x367f60c8
-1,     289863,     289863,     2709,    10836, 0x00000000
+1,     289756,     289756,     2708,    10832, 0x00000000
 0,         99,         99,        1,   161280, 0x367f60c8
-1,     292572,     292572,     2709,    10836, 0x00000000
+1,     292464,     292464,     2708,    10832, 0x00000000
 0,        100,        100,        1,   161280, 0x367f60c8
-1,     295281,     295281,     2709,    10836, 0x00000000
+1,     295172,     295172,     2708,    10832, 0x00000000
 0,        101,        101,        1,   161280, 0x367f60c8
-1,     297990,     297990,     2709,    10836, 0x00000000
+1,     297880,     297880,     2708,    10832, 0x00000000
 0,        102,        102,        1,   161280, 0x367f60c8
-1,     300699,     300699,     2709,    10836, 0x00000000
+1,     300588,     300588,     2708,    10832, 0x00000000
 0,        103,        103,        1,   161280, 0x367f60c8
-1,     303408,     303408,     2709,    10836, 0x00000000
+1,     303296,     303296,     2708,    10832, 0x00000000
 0,        104,        104,        1,   161280, 0x367f60c8
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24
index ad0fed6ebe..a67a482923 100644
--- a/tests/ref/fate/truemotion1-24
+++ b/tests/ref/fate/truemotion1-24
@@ -1,45 +1,45 @@
 #tb 0: 1/15
 #tb 1: 1/44100
 0,          0,          0,        1,    69120, 0x68beb30f
-1,          0,          0,     2709,    10836, 0xedecb6a7
-1,       2709,       2709,     2709,    10836, 0x8098a323
+1,          0,          0,     2708,    10832, 0x1597b4c8
+1,       2708,       2708,     2708,    10832, 0xf9479f8b
 0,          1,          1,        1,    69120, 0x3976f5cf
-1,       5418,       5418,     2709,    10836, 0xcfa1112e
+1,       5416,       5416,     2708,    10832, 0x8db50e74
 0,          2,          2,        1,    69120, 0xf815bc3c
-1,       8127,       8127,     2709,    10836, 0xe241ede4
+1,       8124,       8124,     2708,    10832, 0x2b33ecbb
 0,          3,          3,        1,    69120, 0xa7cc0ae6
-1,      10836,      10836,     2709,    10836, 0xddf254bb
+1,      10832,      10832,     2708,    10832, 0x8d0f537b
 0,          4,          4,        1,    69120, 0xd85ac282
-1,      13545,      13545,     2709,    10836, 0xa16c8507
+1,      13540,      13540,     2708,    10832, 0x922081c7
 0,          5,          5,        1,    69120, 0xf7fd7edb
-1,      16254,      16254,     2709,    10836, 0xbe211f93
+1,      16248,      16248,     2708,    10832, 0x40291f19
 0,          6,          6,        1,    69120, 0x433bb6f6
-1,      18963,      18963,     2709,    10836, 0x26c7283d
+1,      18956,      18956,     2708,    10832, 0x88f5271a
 0,          7,          7,        1,    69120, 0xdbac8bee
-1,      21672,      21672,     2709,    10836, 0x4d18be56
+1,      21664,      21664,     2708,    10832, 0x55c6bbe5
 0,          8,          8,        1,    69120, 0x88e2a799
-1,      24381,      24381,     2709,    10836, 0x57b9af6f
+1,      24372,      24372,     2708,    10832, 0x9b51ae82
 0,          9,          9,        1,    69120, 0x49617b26
-1,      27090,      27090,     2709,    10836, 0xd5864280
+1,      27080,      27080,     2708,    10832, 0xcdf2409b
 0,         10,         10,        1,    69120, 0xeb44ca01
-1,      29799,      29799,     2709,    10836, 0xd582b451
+1,      29788,      29788,     2708,    10832, 0x0933b1a4
 0,         11,         11,        1,    69120, 0x6fea37e8
-1,      32508,      32508,     2709,    10836, 0xec13731d
-1,      35217,      35217,     2709,    10836, 0xe3d4fbb8
+1,      32496,      32496,     2708,    10832, 0x24b77006
+1,      35204,      35204,     2708,    10832, 0xf612fa8a
 0,         12,         12,        1,    69120, 0xf55d74c7
-1,      37926,      37926,     2709,    10836, 0xcbb54d18
+1,      37912,      37912,     2708,    10832, 0x99884b06
 0,         13,         13,        1,    69120, 0xb5082ca7
-1,      40635,      40635,     2709,    10836, 0xff7e7133
+1,      40620,      40620,     2708,    10832, 0x3c746fbe
 0,         14,         14,        1,    69120, 0x5876d758
-1,      43344,      43344,     2709,    10836, 0xcc28b1a7
-1,      46053,      46053,     2709,    10836, 0xbf9e07a5
-1,      48762,      48762,     2709,    10836, 0x16408f38
-1,      51471,      51471,     2709,    10836, 0x2b000c9f
-1,      54180,      54180,     2709,    10836, 0x0ccd9811
-1,      56889,      56889,     2709,    10836, 0xf9575d48
-1,      59598,      59598,     2709,    10836, 0x1ee68190
-1,      62307,      62307,     2709,    10836, 0xde435373
-1,      65016,      65016,     2709,    10836, 0xd83be17a
-1,      67725,      67725,     2709,    10836, 0x9a7f0bbe
-1,      70434,      70434,     2709,    10836, 0x8709e4d3
-1,      73143,      73143,     2709,    10836, 0xde1879cb
+1,      43328,      43328,     2708,    10832, 0x05f3b08a
+1,      46036,      46036,     2708,    10832, 0xa6560483
+1,      48744,      48744,     2708,    10832, 0xd98a8e19
+1,      51452,      51452,     2708,    10832, 0xf98a0b2e
+1,      54160,      54160,     2708,    10832, 0xb1039582
+1,      56868,      56868,     2708,    10832, 0x85dd5c3f
+1,      59576,      59576,     2708,    10832, 0x19fc801a
+1,      62284,      62284,     2708,    10832, 0x95805089
+1,      64992,      64992,     2708,    10832, 0x576fdec3
+1,      67700,      67700,     2708,    10832, 0x704a0905
+1,      70408,      70408,     2708,    10832, 0xf87ce1fa
+1,      73116,      73116,     2708,    10832, 0xfc0076b9