Switch rANS to 15 bit precision, and adjust L_BASE.

This causes rANS to operate at the same precision as the Daala EC.

aom/master stats: rans10uabs8lbase12 → rans15uabs8lbase15

objective-1-fast
PSNR YCbCr:      0.01%      0.01%      0.01%
   PSNRHVS:      0.01%
      SSIM:      0.01%
    MSSSIM:      0.01%
 CIEDE2000:      0.01%

subset1
PSNR YCbCr:     -0.01%     -0.00%     -0.00%
   PSNRHVS:     -0.01%
      SSIM:     -0.01%
    MSSSIM:     -0.01%
 CIEDE2000:     -0.01%

(cherry picked from aom/master commit ddbc2e2a68bfc997dc61fca5bcaac3a75245e965)

Change-Id: I6ef0a4f6198784b3712a61af9f105d560a22eaea

diff --git a/aom_dsp/ans.h b/aom_dsp/ans.h
index 5927e58ea12bbbf55436d329d285728f87c141f0..08735bb71f751c702adcef9aff21002b977ca8ef 100644 (file)
--- a/aom_dsp/ans.h
+++ b/aom_dsp/ans.h
@@ -26,10 +26,12 @@ extern "C" {
 typedef uint8_t AnsP8;
 #define ANS_P8_PRECISION 256u
 #define ANS_P8_SHIFT 8
-#define RANS_PRECISION 1024u
-#define RANS_PROB_BITS 10
+#define RANS_PROB_BITS 15
+#define RANS_PRECISION (1u << RANS_PROB_BITS)
 
-#define L_BASE (RANS_PRECISION * 4)  // L_BASE % precision must be 0
+// L_BASE % PRECISION must be 0. Increasing L_BASE beyond 2**15 will cause uabs
+// to overflow.
+#define L_BASE (RANS_PRECISION)
 #define IO_BASE 256
 // Range I = { L_BASE, L_BASE + 1, ..., L_BASE * IO_BASE - 1 }
 

diff --git a/aom_dsp/ansreader.h b/aom_dsp/ansreader.h
index 1f6653145fab087b6e16a8b4dba054a45a3a544f..c46778b61ba0898109ec0cf33b8d7c5bd7ec99bb 100644 (file)
--- a/aom_dsp/ansreader.h
+++ b/aom_dsp/ansreader.h
@@ -111,8 +111,12 @@ static INLINE int ans_read_init(struct AnsDecoder *const ans,
     if (offset < 3) return 1;
     ans->buf_offset = offset - 3;
     ans->state = mem_get_le24(buf + offset - 3) & 0x3FFFFF;
+  } else if ((buf[offset - 1] & 0xE0) == 0xE0) {
+    if (offset < 4) return 1;
+    ans->buf_offset = offset - 4;
+    ans->state = mem_get_le32(buf + offset - 4) & 0x1FFFFFFF;
   } else {
-    // x == 3 implies this byte is a superframe marker
+    // 110xxxxx implies this byte is a superframe marker
     return 1;
   }
   ans->state += L_BASE;

diff --git a/aom_dsp/answriter.h b/aom_dsp/answriter.h
index 0ac1bda6690ad033fa4e51a7bf3ff3963b8f02ef..298b25589b95e74c875b07fb9b60ce9a324cca10 100644 (file)
--- a/aom_dsp/answriter.h
+++ b/aom_dsp/answriter.h
@@ -54,6 +54,9 @@ static INLINE int ans_write_end(struct AnsCoder *const ans) {
   } else if (state < (1 << 22)) {
     mem_put_le24(ans->buf + ans->buf_offset, (0x02 << 22) + state);
     return ans->buf_offset + 3;
+  } else if (state < (1 << 29)) {
+    mem_put_le32(ans->buf + ans->buf_offset, (0x07 << 29) + state);
+    return ans->buf_offset + 4;
   } else {
     assert(0 && "State is too large to be serialized");
     return ans->buf_offset;

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 1defc533328af408a23d77ed109f867d26d7ad24..e30ae71d3da6503372b258afc417dbcd9c2c0a6a 100644 (file)
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -420,261 +420,261 @@ const aom_prob av1_pareto8_full[COEFF_PROB_MODELS][MODEL_NODES] = {
 // ZERO_TOKEN and EOB_TOKEN are coded as flags outside this coder.
 const aom_cdf_prob
     av1_pareto8_token_probs[COEFF_PROB_MODELS][ENTROPY_TOKENS - 2] = {
-      { 4, 4, 4, 4, 8, 15, 30, 57, 103, 795 },
-      { 8, 8, 8, 8, 15, 30, 57, 103, 168, 619 },
-      { 12, 12, 12, 12, 23, 43, 80, 138, 205, 487 },
-      { 16, 16, 15, 15, 30, 56, 101, 165, 225, 385 },
-      { 20, 20, 19, 19, 36, 68, 119, 186, 231, 306 },
-      { 24, 23, 23, 22, 43, 79, 135, 201, 230, 244 },
-      { 28, 27, 26, 26, 49, 89, 149, 211, 223, 196 },
-      { 32, 31, 30, 29, 55, 98, 160, 218, 212, 159 },
-      { 36, 35, 33, 32, 60, 107, 171, 221, 200, 129 },
-      { 40, 38, 37, 35, 66, 115, 179, 222, 187, 105 },
-      { 44, 42, 40, 38, 71, 122, 186, 221, 174, 86 },
-      { 48, 45, 43, 41, 76, 129, 192, 219, 160, 71 },
-      { 52, 49, 46, 44, 80, 136, 196, 215, 148, 58 },
-      { 56, 53, 49, 46, 85, 142, 200, 210, 135, 48 },
-      { 60, 56, 52, 49, 89, 147, 203, 204, 124, 40 },
-      { 64, 60, 55, 52, 93, 151, 205, 198, 113, 33 },
-      { 68, 63, 58, 54, 97, 156, 205, 192, 103, 28 },
-      { 72, 66, 61, 57, 100, 160, 206, 185, 94, 23 },
-      { 76, 70, 64, 59, 104, 163, 205, 178, 85, 20 },
-      { 80, 73, 67, 61, 107, 166, 205, 171, 77, 17 },
-      { 84, 76, 69, 63, 110, 169, 204, 164, 71, 14 },
-      { 88, 80, 72, 65, 113, 171, 202, 157, 64, 12 },
-      { 92, 83, 75, 67, 116, 173, 200, 150, 58, 10 },
-      { 96, 86, 77, 69, 118, 175, 198, 143, 53, 9 },
-      { 100, 89, 80, 71, 121, 176, 195, 137, 48, 7 },
-      { 104, 92, 82, 73, 123, 178, 192, 130, 44, 6 },
-      { 108, 96, 84, 75, 125, 178, 189, 124, 40, 5 },
-      { 112, 98, 87, 76, 127, 179, 186, 118, 36, 5 },
-      { 116, 101, 89, 78, 129, 179, 183, 112, 33, 4 },
-      { 120, 104, 91, 80, 131, 180, 179, 106, 30, 3 },
-      { 124, 107, 93, 81, 132, 180, 176, 101, 27, 3 },
-      { 128, 110, 95, 82, 134, 179, 172, 96, 25, 3 },
-      { 132, 113, 97, 84, 135, 179, 168, 91, 23, 2 },
-      { 136, 116, 99, 85, 136, 179, 164, 86, 21, 2 },
-      { 140, 119, 101, 86, 137, 178, 160, 82, 19, 2 },
-      { 144, 122, 103, 88, 138, 177, 157, 77, 17, 1 },
-      { 148, 124, 105, 89, 139, 176, 153, 73, 16, 1 },
-      { 152, 127, 107, 90, 140, 175, 149, 69, 14, 1 },
-      { 156, 130, 108, 91, 141, 173, 145, 66, 13, 1 },
-      { 160, 133, 110, 92, 141, 172, 141, 62, 12, 1 },
-      { 164, 135, 111, 93, 142, 171, 137, 59, 11, 1 },
-      { 168, 138, 113, 94, 142, 169, 133, 56, 10, 1 },
-      { 172, 140, 115, 94, 142, 168, 130, 53, 9, 1 },
-      { 176, 143, 116, 95, 143, 166, 126, 50, 8, 1 },
-      { 180, 145, 118, 96, 143, 164, 122, 47, 8, 1 },
-      { 184, 147, 119, 96, 143, 163, 119, 45, 7, 1 },
-      { 188, 150, 120, 97, 143, 161, 116, 42, 6, 1 },
-      { 192, 152, 121, 98, 143, 159, 112, 40, 6, 1 },
-      { 196, 155, 123, 98, 142, 157, 109, 38, 5, 1 },
-      { 200, 157, 124, 99, 142, 155, 105, 36, 5, 1 },
-      { 204, 159, 125, 99, 142, 153, 102, 34, 5, 1 },
-      { 208, 161, 126, 100, 142, 151, 99, 32, 4, 1 },
-      { 212, 164, 127, 100, 141, 149, 96, 30, 4, 1 },
-      { 216, 166, 129, 100, 141, 147, 93, 28, 3, 1 },
-      { 220, 168, 130, 101, 140, 144, 90, 27, 3, 1 },
-      { 224, 170, 131, 101, 140, 142, 87, 25, 3, 1 },
-      { 228, 172, 132, 101, 139, 140, 84, 24, 3, 1 },
-      { 232, 174, 132, 101, 139, 138, 81, 23, 3, 1 },
-      { 236, 176, 133, 101, 138, 136, 79, 22, 2, 1 },
-      { 240, 178, 134, 102, 137, 134, 76, 20, 2, 1 },
-      { 244, 180, 135, 102, 136, 131, 74, 19, 2, 1 },
-      { 248, 182, 135, 102, 136, 129, 71, 18, 2, 1 },
-      { 252, 184, 136, 101, 135, 127, 69, 17, 2, 1 },
-      { 256, 186, 137, 102, 134, 124, 66, 16, 2, 1 },
-      { 260, 188, 138, 102, 133, 122, 64, 15, 1, 1 },
-      { 264, 190, 138, 101, 132, 120, 62, 15, 1, 1 },
-      { 268, 191, 139, 101, 131, 118, 60, 14, 1, 1 },
-      { 272, 193, 139, 101, 130, 116, 58, 13, 1, 1 },
-      { 276, 195, 139, 101, 129, 114, 56, 12, 1, 1 },
-      { 280, 196, 140, 101, 128, 111, 54, 12, 1, 1 },
-      { 284, 198, 140, 101, 127, 109, 52, 11, 1, 1 },
-      { 288, 200, 141, 100, 126, 107, 50, 10, 1, 1 },
-      { 292, 201, 141, 100, 125, 105, 48, 10, 1, 1 },
-      { 296, 203, 141, 100, 123, 103, 47, 9, 1, 1 },
-      { 300, 204, 142, 99, 122, 101, 45, 9, 1, 1 },
-      { 304, 206, 142, 99, 121, 99, 43, 8, 1, 1 },
-      { 308, 207, 142, 99, 119, 97, 42, 8, 1, 1 },
-      { 312, 209, 142, 99, 118, 95, 40, 7, 1, 1 },
-      { 316, 210, 142, 98, 117, 93, 39, 7, 1, 1 },
-      { 320, 211, 142, 98, 116, 91, 37, 7, 1, 1 },
-      { 324, 213, 142, 97, 115, 89, 36, 6, 1, 1 },
-      { 328, 214, 142, 97, 113, 87, 35, 6, 1, 1 },
-      { 332, 215, 143, 96, 112, 85, 33, 6, 1, 1 },
-      { 336, 216, 143, 96, 111, 83, 32, 5, 1, 1 },
-      { 340, 218, 143, 95, 109, 81, 31, 5, 1, 1 },
-      { 344, 219, 142, 95, 108, 79, 30, 5, 1, 1 },
-      { 348, 220, 142, 94, 107, 78, 29, 4, 1, 1 },
-      { 352, 221, 142, 94, 105, 76, 28, 4, 1, 1 },
-      { 356, 222, 142, 93, 104, 74, 27, 4, 1, 1 },
-      { 360, 223, 142, 92, 103, 72, 26, 4, 1, 1 },
-      { 364, 224, 142, 92, 101, 70, 25, 4, 1, 1 },
-      { 368, 225, 142, 91, 100, 69, 24, 3, 1, 1 },
-      { 372, 226, 141, 91, 99, 67, 23, 3, 1, 1 },
-      { 376, 227, 141, 90, 97, 66, 22, 3, 1, 1 },
-      { 380, 228, 141, 89, 96, 64, 21, 3, 1, 1 },
-      { 384, 229, 140, 89, 95, 62, 20, 3, 1, 1 },
-      { 388, 229, 140, 88, 93, 61, 20, 3, 1, 1 },
-      { 392, 230, 140, 87, 92, 60, 19, 2, 1, 1 },
-      { 396, 231, 140, 86, 91, 58, 18, 2, 1, 1 },
-      { 400, 232, 139, 86, 89, 57, 17, 2, 1, 1 },
-      { 404, 232, 139, 85, 88, 55, 17, 2, 1, 1 },
-      { 408, 233, 138, 84, 87, 54, 16, 2, 1, 1 },
-      { 412, 234, 138, 84, 85, 52, 15, 2, 1, 1 },
-      { 416, 234, 137, 83, 84, 51, 15, 2, 1, 1 },
-      { 420, 235, 137, 82, 82, 50, 14, 2, 1, 1 },
-      { 424, 236, 136, 81, 81, 48, 14, 2, 1, 1 },
-      { 428, 236, 136, 81, 80, 47, 13, 1, 1, 1 },
-      { 432, 236, 135, 80, 79, 46, 13, 1, 1, 1 },
-      { 436, 237, 135, 79, 77, 45, 12, 1, 1, 1 },
-      { 440, 238, 134, 78, 76, 43, 12, 1, 1, 1 },
-      { 444, 238, 134, 77, 75, 42, 11, 1, 1, 1 },
-      { 448, 238, 133, 77, 73, 41, 11, 1, 1, 1 },
-      { 452, 239, 132, 76, 72, 40, 10, 1, 1, 1 },
-      { 456, 239, 131, 75, 71, 39, 10, 1, 1, 1 },
-      { 460, 239, 131, 74, 70, 38, 9, 1, 1, 1 },
-      { 464, 240, 130, 73, 68, 37, 9, 1, 1, 1 },
-      { 468, 240, 129, 72, 67, 36, 9, 1, 1, 1 },
-      { 472, 240, 128, 72, 66, 35, 8, 1, 1, 1 },
-      { 476, 240, 127, 71, 65, 34, 8, 1, 1, 1 },
-      { 480, 240, 127, 70, 63, 33, 8, 1, 1, 1 },
-      { 484, 241, 126, 69, 62, 32, 7, 1, 1, 1 },
-      { 488, 241, 125, 68, 61, 31, 7, 1, 1, 1 },
-      { 492, 241, 124, 67, 60, 30, 7, 1, 1, 1 },
-      { 496, 241, 124, 66, 59, 29, 6, 1, 1, 1 },
-      { 500, 240, 123, 66, 58, 28, 6, 1, 1, 1 },
-      { 504, 240, 122, 65, 57, 27, 6, 1, 1, 1 },
-      { 508, 240, 121, 64, 55, 27, 6, 1, 1, 1 },
-      { 512, 241, 120, 63, 54, 26, 5, 1, 1, 1 },
-      { 516, 241, 119, 62, 53, 25, 5, 1, 1, 1 },
-      { 520, 240, 118, 62, 52, 24, 5, 1, 1, 1 },
-      { 524, 240, 117, 60, 51, 24, 5, 1, 1, 1 },
-      { 528, 239, 116, 60, 50, 23, 5, 1, 1, 1 },
-      { 532, 239, 116, 59, 49, 22, 4, 1, 1, 1 },
-      { 536, 239, 115, 58, 48, 21, 4, 1, 1, 1 },
-      { 540, 239, 113, 57, 47, 21, 4, 1, 1, 1 },
-      { 544, 238, 113, 56, 46, 20, 4, 1, 1, 1 },
-      { 548, 238, 112, 55, 45, 19, 4, 1, 1, 1 },
-      { 552, 238, 110, 55, 44, 19, 3, 1, 1, 1 },
-      { 556, 237, 110, 54, 43, 18, 3, 1, 1, 1 },
-      { 560, 237, 108, 53, 42, 18, 3, 1, 1, 1 },
-      { 564, 236, 108, 52, 41, 17, 3, 1, 1, 1 },
-      { 568, 236, 106, 51, 40, 17, 3, 1, 1, 1 },
-      { 572, 235, 105, 51, 39, 16, 3, 1, 1, 1 },
-      { 576, 235, 104, 50, 38, 15, 3, 1, 1, 1 },
-      { 580, 234, 103, 49, 37, 15, 3, 1, 1, 1 },
-      { 584, 234, 102, 48, 37, 14, 2, 1, 1, 1 },
-      { 588, 233, 101, 47, 36, 14, 2, 1, 1, 1 },
-      { 592, 233, 100, 46, 35, 13, 2, 1, 1, 1 },
-      { 596, 231, 99, 46, 34, 13, 2, 1, 1, 1 },
-      { 600, 230, 98, 45, 33, 13, 2, 1, 1, 1 },
-      { 604, 230, 97, 44, 32, 12, 2, 1, 1, 1 },
-      { 608, 229, 96, 43, 31, 12, 2, 1, 1, 1 },
-      { 612, 228, 95, 42, 31, 11, 2, 1, 1, 1 },
-      { 616, 227, 93, 42, 30, 11, 2, 1, 1, 1 },
-      { 620, 227, 92, 41, 29, 10, 2, 1, 1, 1 },
-      { 624, 226, 92, 40, 28, 10, 1, 1, 1, 1 },
-      { 628, 225, 90, 39, 28, 10, 1, 1, 1, 1 },
-      { 632, 224, 89, 39, 27, 9, 1, 1, 1, 1 },
-      { 636, 223, 88, 38, 26, 9, 1, 1, 1, 1 },
-      { 640, 222, 87, 37, 25, 9, 1, 1, 1, 1 },
-      { 644, 221, 86, 36, 25, 8, 1, 1, 1, 1 },
-      { 648, 220, 84, 36, 24, 8, 1, 1, 1, 1 },
-      { 652, 219, 83, 35, 23, 8, 1, 1, 1, 1 },
-      { 656, 218, 82, 34, 23, 7, 1, 1, 1, 1 },
-      { 660, 217, 81, 33, 22, 7, 1, 1, 1, 1 },
-      { 664, 215, 80, 33, 21, 7, 1, 1, 1, 1 },
-      { 668, 214, 78, 32, 21, 7, 1, 1, 1, 1 },
-      { 672, 213, 78, 31, 20, 6, 1, 1, 1, 1 },
-      { 676, 211, 76, 31, 20, 6, 1, 1, 1, 1 },
-      { 680, 210, 75, 30, 19, 6, 1, 1, 1, 1 },
-      { 684, 209, 74, 29, 18, 6, 1, 1, 1, 1 },
-      { 688, 208, 73, 28, 18, 5, 1, 1, 1, 1 },
-      { 692, 206, 72, 28, 17, 5, 1, 1, 1, 1 },
-      { 696, 205, 70, 27, 17, 5, 1, 1, 1, 1 },
-      { 700, 203, 69, 27, 16, 5, 1, 1, 1, 1 },
-      { 704, 201, 68, 26, 16, 5, 1, 1, 1, 1 },
-      { 708, 201, 67, 25, 15, 4, 1, 1, 1, 1 },
-      { 712, 198, 66, 25, 15, 4, 1, 1, 1, 1 },
-      { 716, 197, 65, 24, 14, 4, 1, 1, 1, 1 },
-      { 720, 196, 63, 23, 14, 4, 1, 1, 1, 1 },
-      { 724, 194, 62, 23, 13, 4, 1, 1, 1, 1 },
-      { 728, 193, 61, 22, 13, 3, 1, 1, 1, 1 },
-      { 732, 191, 60, 22, 12, 3, 1, 1, 1, 1 },
-      { 736, 189, 59, 21, 12, 3, 1, 1, 1, 1 },
-      { 740, 188, 58, 20, 11, 3, 1, 1, 1, 1 },
-      { 744, 186, 56, 20, 11, 3, 1, 1, 1, 1 },
-      { 748, 184, 55, 19, 11, 3, 1, 1, 1, 1 },
-      { 752, 182, 54, 19, 10, 3, 1, 1, 1, 1 },
-      { 756, 181, 53, 18, 10, 2, 1, 1, 1, 1 },
-      { 760, 179, 52, 18, 9, 2, 1, 1, 1, 1 },
-      { 764, 177, 51, 17, 9, 2, 1, 1, 1, 1 },
-      { 768, 174, 50, 17, 9, 2, 1, 1, 1, 1 },
-      { 772, 173, 49, 16, 8, 2, 1, 1, 1, 1 },
-      { 776, 171, 47, 16, 8, 2, 1, 1, 1, 1 },
-      { 780, 169, 46, 15, 8, 2, 1, 1, 1, 1 },
-      { 784, 167, 45, 15, 7, 2, 1, 1, 1, 1 },
-      { 788, 165, 44, 14, 7, 2, 1, 1, 1, 1 },
-      { 792, 162, 43, 14, 7, 2, 1, 1, 1, 1 },
-      { 796, 161, 42, 13, 7, 1, 1, 1, 1, 1 },
-      { 800, 159, 41, 13, 6, 1, 1, 1, 1, 1 },
-      { 804, 157, 40, 12, 6, 1, 1, 1, 1, 1 },
-      { 808, 154, 39, 12, 6, 1, 1, 1, 1, 1 },
-      { 812, 153, 38, 11, 5, 1, 1, 1, 1, 1 },
-      { 816, 150, 37, 11, 5, 1, 1, 1, 1, 1 },
-      { 820, 148, 36, 10, 5, 1, 1, 1, 1, 1 },
-      { 824, 145, 35, 10, 5, 1, 1, 1, 1, 1 },
-      { 828, 143, 34, 10, 4, 1, 1, 1, 1, 1 },
-      { 832, 141, 33, 9, 4, 1, 1, 1, 1, 1 },
-      { 836, 138, 32, 9, 4, 1, 1, 1, 1, 1 },
-      { 840, 136, 30, 9, 4, 1, 1, 1, 1, 1 },
-      { 844, 133, 30, 8, 4, 1, 1, 1, 1, 1 },
-      { 848, 131, 29, 8, 3, 1, 1, 1, 1, 1 },
-      { 852, 129, 28, 7, 3, 1, 1, 1, 1, 1 },
-      { 856, 126, 27, 7, 3, 1, 1, 1, 1, 1 },
-      { 860, 123, 26, 7, 3, 1, 1, 1, 1, 1 },
-      { 864, 121, 25, 6, 3, 1, 1, 1, 1, 1 },
-      { 868, 118, 24, 6, 3, 1, 1, 1, 1, 1 },
-      { 872, 116, 23, 6, 2, 1, 1, 1, 1, 1 },
-      { 876, 113, 22, 6, 2, 1, 1, 1, 1, 1 },
-      { 880, 111, 21, 5, 2, 1, 1, 1, 1, 1 },
-      { 884, 108, 20, 5, 2, 1, 1, 1, 1, 1 },
-      { 888, 105, 19, 5, 2, 1, 1, 1, 1, 1 },
-      { 892, 102, 19, 4, 2, 1, 1, 1, 1, 1 },
-      { 896, 99, 18, 4, 2, 1, 1, 1, 1, 1 },
-      { 900, 97, 17, 4, 1, 1, 1, 1, 1, 1 },
-      { 904, 94, 16, 4, 1, 1, 1, 1, 1, 1 },
-      { 908, 92, 15, 3, 1, 1, 1, 1, 1, 1 },
-      { 912, 89, 14, 3, 1, 1, 1, 1, 1, 1 },
-      { 916, 85, 14, 3, 1, 1, 1, 1, 1, 1 },
-      { 920, 82, 13, 3, 1, 1, 1, 1, 1, 1 },
-      { 924, 79, 12, 3, 1, 1, 1, 1, 1, 1 },
-      { 928, 77, 11, 2, 1, 1, 1, 1, 1, 1 },
-      { 932, 73, 11, 2, 1, 1, 1, 1, 1, 1 },
-      { 936, 70, 10, 2, 1, 1, 1, 1, 1, 1 },
-      { 940, 67, 9, 2, 1, 1, 1, 1, 1, 1 },
-      { 944, 64, 8, 2, 1, 1, 1, 1, 1, 1 },
-      { 948, 60, 8, 2, 1, 1, 1, 1, 1, 1 },
-      { 952, 58, 7, 1, 1, 1, 1, 1, 1, 1 },
-      { 956, 54, 7, 1, 1, 1, 1, 1, 1, 1 },
-      { 960, 51, 6, 1, 1, 1, 1, 1, 1, 1 },
-      { 964, 48, 5, 1, 1, 1, 1, 1, 1, 1 },
-      { 968, 44, 5, 1, 1, 1, 1, 1, 1, 1 },
-      { 972, 41, 4, 1, 1, 1, 1, 1, 1, 1 },
-      { 976, 37, 4, 1, 1, 1, 1, 1, 1, 1 },
-      { 980, 34, 3, 1, 1, 1, 1, 1, 1, 1 },
-      { 984, 30, 3, 1, 1, 1, 1, 1, 1, 1 },
-      { 988, 27, 2, 1, 1, 1, 1, 1, 1, 1 },
-      { 992, 23, 2, 1, 1, 1, 1, 1, 1, 1 },
-      { 996, 19, 2, 1, 1, 1, 1, 1, 1, 1 },
-      { 1000, 16, 1, 1, 1, 1, 1, 1, 1, 1 },
-      { 1004, 12, 1, 1, 1, 1, 1, 1, 1, 1 },
-      { 1008, 8, 1, 1, 1, 1, 1, 1, 1, 1 },
-      { 1012, 4, 1, 1, 1, 1, 1, 1, 1, 1 },
-      { 1015, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
-      { 1015, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+      { 128, 127, 127, 126, 251, 495, 965, 1832, 3305, 25412 },
+      { 256, 254, 252, 249, 492, 959, 1820, 3283, 5365, 19838 },
+      { 384, 379, 374, 369, 724, 1392, 2574, 4417, 6568, 15587 },
+      { 512, 503, 494, 486, 946, 1795, 3238, 5289, 7184, 12321 },
+      { 640, 626, 612, 599, 1159, 2172, 3818, 5946, 7401, 9795 },
+      { 768, 748, 728, 709, 1363, 2522, 4324, 6424, 7352, 7830 },
+      { 896, 869, 842, 816, 1559, 2847, 4762, 6755, 7131, 6291 },
+      { 1024, 988, 954, 921, 1747, 3148, 5139, 6966, 6803, 5078 },
+      { 1152, 1107, 1063, 1022, 1926, 3427, 5460, 7080, 6412, 4119 },
+      { 1280, 1224, 1171, 1120, 2098, 3685, 5730, 7113, 5991, 3356 },
+      { 1408, 1340, 1276, 1216, 2261, 3923, 5955, 7083, 5560, 2746 },
+      { 1536, 1455, 1380, 1308, 2418, 4142, 6140, 7001, 5133, 2255 },
+      { 1664, 1569, 1481, 1398, 2567, 4342, 6287, 6879, 4721, 1860 },
+      { 1792, 1683, 1580, 1485, 2709, 4525, 6401, 6725, 4329, 1539 },
+      { 1920, 1794, 1678, 1570, 2845, 4692, 6486, 6546, 3959, 1278 },
+      { 2048, 1905, 1773, 1651, 2974, 4844, 6543, 6350, 3615, 1065 },
+      { 2176, 2015, 1867, 1731, 3096, 4980, 6576, 6140, 3296, 891 },
+      { 2304, 2123, 1958, 1807, 3212, 5104, 6589, 5922, 3002, 747 },
+      { 2432, 2231, 2048, 1882, 3322, 5214, 6581, 5698, 2732, 628 },
+      { 2560, 2337, 2136, 1953, 3427, 5311, 6557, 5472, 2485, 530 },
+      { 2688, 2442, 2222, 2023, 3525, 5397, 6518, 5246, 2259, 448 },
+      { 2816, 2547, 2306, 2090, 3618, 5472, 6465, 5021, 2053, 380 },
+      { 2944, 2650, 2388, 2154, 3706, 5537, 6401, 4799, 1866, 323 },
+      { 3072, 2752, 2468, 2217, 3788, 5591, 6327, 4581, 1696, 276 },
+      { 3200, 2853, 2547, 2277, 3866, 5637, 6243, 4369, 1541, 235 },
+      { 3328, 2952, 2624, 2335, 3938, 5673, 6152, 4163, 1401, 202 },
+      { 3456, 3051, 2699, 2391, 4006, 5702, 6054, 3962, 1274, 173 },
+      { 3584, 3149, 2772, 2444, 4070, 5723, 5950, 3769, 1158, 149 },
+      { 3712, 3246, 2843, 2496, 4128, 5736, 5842, 3583, 1054, 128 },
+      { 3840, 3341, 2913, 2545, 4183, 5743, 5729, 3404, 959, 111 },
+      { 3968, 3436, 2981, 2593, 4233, 5743, 5614, 3232, 872, 96 },
+      { 4096, 3529, 3048, 2638, 4280, 5737, 5496, 3067, 794, 83 },
+      { 4224, 3621, 3113, 2682, 4322, 5726, 5375, 2909, 724, 72 },
+      { 4352, 3712, 3176, 2724, 4361, 5709, 5253, 2759, 659, 63 },
+      { 4480, 3803, 3237, 2764, 4396, 5687, 5130, 2615, 601, 55 },
+      { 4608, 3892, 3297, 2801, 4428, 5661, 5007, 2478, 548, 48 },
+      { 4736, 3980, 3355, 2838, 4456, 5631, 4883, 2347, 500, 42 },
+      { 4864, 4067, 3412, 2872, 4481, 5596, 4760, 2223, 456, 37 },
+      { 4992, 4152, 3467, 2905, 4503, 5558, 4637, 2105, 417, 32 },
+      { 5120, 4237, 3521, 2936, 4521, 5516, 4515, 1993, 381, 28 },
+      { 5248, 4321, 3573, 2966, 4537, 5471, 4393, 1886, 348, 25 },
+      { 5376, 4404, 3623, 2993, 4550, 5424, 4273, 1785, 318, 22 },
+      { 5504, 4486, 3672, 3020, 4560, 5373, 4155, 1688, 291, 19 },
+      { 5632, 4566, 3720, 3044, 4568, 5321, 4037, 1597, 266, 17 },
+      { 5760, 4646, 3766, 3067, 4572, 5265, 3922, 1511, 244, 15 },
+      { 5888, 4724, 3811, 3089, 4575, 5208, 3808, 1429, 223, 13 },
+      { 6016, 4802, 3854, 3109, 4575, 5148, 3696, 1352, 204, 12 },
+      { 6144, 4878, 3895, 3128, 4573, 5088, 3587, 1278, 187, 10 },
+      { 6272, 4953, 3936, 3145, 4568, 5025, 3479, 1209, 172, 9 },
+      { 6400, 5028, 3975, 3161, 4561, 4961, 3373, 1143, 158, 8 },
+      { 6528, 5101, 4012, 3175, 4553, 4896, 3270, 1081, 145, 7 },
+      { 6656, 5173, 4048, 3189, 4542, 4830, 3168, 1022, 133, 7 },
+      { 6784, 5244, 4083, 3201, 4530, 4763, 3069, 966, 122, 6 },
+      { 6912, 5314, 4117, 3212, 4516, 4694, 2973, 913, 112, 5 },
+      { 7040, 5383, 4149, 3221, 4500, 4626, 2878, 863, 103, 5 },
+      { 7168, 5452, 4180, 3229, 4482, 4556, 2786, 816, 95, 4 },
+      { 7296, 5519, 4210, 3236, 4463, 4486, 2696, 771, 87, 4 },
+      { 7424, 5585, 4238, 3242, 4442, 4416, 2609, 729, 80, 3 },
+      { 7552, 5650, 4265, 3247, 4420, 4345, 2523, 689, 74, 3 },
+      { 7680, 5714, 4291, 3251, 4396, 4274, 2440, 651, 68, 3 },
+      { 7808, 5777, 4315, 3254, 4371, 4203, 2359, 616, 63, 2 },
+      { 7936, 5838, 4339, 3255, 4345, 4132, 2281, 582, 58, 2 },
+      { 8064, 5899, 4361, 3256, 4318, 4061, 2204, 550, 53, 2 },
+      { 8192, 5959, 4382, 3255, 4289, 3990, 2130, 520, 49, 2 },
+      { 8320, 6018, 4402, 3254, 4259, 3919, 2057, 492, 45, 2 },
+      { 8448, 6075, 4421, 3252, 4229, 3848, 1987, 465, 42, 1 },
+      { 8576, 6133, 4438, 3248, 4197, 3778, 1919, 439, 39, 1 },
+      { 8704, 6188, 4455, 3244, 4164, 3708, 1853, 415, 36, 1 },
+      { 8832, 6243, 4470, 3239, 4131, 3638, 1789, 392, 33, 1 },
+      { 8960, 6297, 4484, 3233, 4096, 3569, 1727, 371, 30, 1 },
+      { 9088, 6349, 4497, 3226, 4061, 3500, 1667, 351, 28, 1 },
+      { 9216, 6401, 4509, 3219, 4025, 3432, 1608, 331, 26, 1 },
+      { 9344, 6452, 4520, 3210, 3989, 3364, 1551, 313, 24, 1 },
+      { 9472, 6501, 4530, 3201, 3952, 3297, 1496, 296, 22, 1 },
+      { 9600, 6550, 4539, 3191, 3914, 3230, 1443, 280, 20, 1 },
+      { 9728, 6597, 4547, 3180, 3875, 3164, 1392, 265, 19, 1 },
+      { 9856, 6644, 4554, 3169, 3836, 3098, 1342, 250, 18, 1 },
+      { 9984, 6690, 4560, 3157, 3796, 3034, 1293, 237, 16, 1 },
+      { 10112, 6734, 4565, 3144, 3756, 2970, 1247, 224, 15, 1 },
+      { 10240, 6778, 4568, 3131, 3716, 2907, 1202, 211, 14, 1 },
+      { 10368, 6821, 4571, 3117, 3675, 2844, 1158, 200, 13, 1 },
+      { 10496, 6862, 4573, 3102, 3634, 2783, 1116, 189, 12, 1 },
+      { 10624, 6903, 4574, 3087, 3592, 2722, 1075, 179, 11, 1 },
+      { 10752, 6942, 4575, 3071, 3551, 2662, 1035, 169, 10, 1 },
+      { 10880, 6981, 4574, 3054, 3508, 2603, 997, 160, 10, 1 },
+      { 11008, 7019, 4572, 3038, 3466, 2544, 960, 151, 9, 1 },
+      { 11136, 7055, 4570, 3020, 3424, 2487, 924, 143, 8, 1 },
+      { 11264, 7091, 4566, 3002, 3381, 2430, 890, 135, 8, 1 },
+      { 11392, 7126, 4563, 2984, 3338, 2374, 856, 127, 7, 1 },
+      { 11520, 7159, 4557, 2965, 3295, 2319, 824, 121, 7, 1 },
+      { 11648, 7193, 4552, 2945, 3252, 2264, 793, 114, 6, 1 },
+      { 11776, 7224, 4545, 2925, 3209, 2211, 763, 108, 6, 1 },
+      { 11904, 7255, 4538, 2905, 3165, 2159, 734, 102, 5, 1 },
+      { 12032, 7285, 4530, 2884, 3122, 2107, 706, 96, 5, 1 },
+      { 12160, 7314, 4520, 2863, 3079, 2056, 679, 91, 5, 1 },
+      { 12288, 7341, 4511, 2842, 3036, 2006, 653, 86, 4, 1 },
+      { 12416, 7368, 4500, 2820, 2993, 1957, 628, 81, 4, 1 },
+      { 12544, 7394, 4489, 2797, 2949, 1909, 604, 77, 4, 1 },
+      { 12672, 7419, 4477, 2775, 2906, 1861, 581, 73, 3, 1 },
+      { 12800, 7443, 4464, 2752, 2863, 1815, 558, 69, 3, 1 },
+      { 12928, 7466, 4451, 2729, 2820, 1769, 536, 65, 3, 1 },
+      { 13056, 7488, 4437, 2705, 2777, 1724, 516, 61, 3, 1 },
+      { 13184, 7509, 4422, 2682, 2734, 1680, 495, 58, 3, 1 },
+      { 13312, 7529, 4406, 2658, 2692, 1637, 476, 55, 2, 1 },
+      { 13440, 7548, 4390, 2633, 2650, 1595, 457, 52, 2, 1 },
+      { 13568, 7567, 4373, 2609, 2607, 1553, 439, 49, 2, 1 },
+      { 13696, 7583, 4356, 2584, 2565, 1513, 422, 46, 2, 1 },
+      { 13824, 7600, 4337, 2559, 2523, 1473, 405, 44, 2, 1 },
+      { 13952, 7615, 4319, 2533, 2482, 1434, 389, 41, 2, 1 },
+      { 14080, 7629, 4300, 2508, 2441, 1395, 373, 39, 2, 1 },
+      { 14208, 7643, 4280, 2482, 2400, 1358, 358, 37, 1, 1 },
+      { 14336, 7655, 4259, 2457, 2359, 1321, 344, 35, 1, 1 },
+      { 14464, 7667, 4238, 2431, 2318, 1285, 330, 33, 1, 1 },
+      { 14592, 7677, 4217, 2405, 2278, 1250, 316, 31, 1, 1 },
+      { 14720, 7687, 4195, 2378, 2238, 1215, 304, 29, 1, 1 },
+      { 14848, 7696, 4172, 2352, 2198, 1181, 291, 28, 1, 1 },
+      { 14976, 7703, 4149, 2326, 2159, 1148, 279, 26, 1, 1 },
+      { 15104, 7710, 4125, 2299, 2119, 1116, 268, 25, 1, 1 },
+      { 15232, 7715, 4101, 2272, 2081, 1085, 257, 23, 1, 1 },
+      { 15360, 7721, 4076, 2245, 2042, 1054, 246, 22, 1, 1 },
+      { 15488, 7724, 4051, 2219, 2004, 1023, 236, 21, 1, 1 },
+      { 15616, 7727, 4025, 2192, 1966, 994, 226, 20, 1, 1 },
+      { 15744, 7729, 3999, 2164, 1929, 965, 217, 19, 1, 1 },
+      { 15872, 7731, 3972, 2137, 1892, 937, 207, 18, 1, 1 },
+      { 16000, 7731, 3945, 2110, 1855, 909, 199, 17, 1, 1 },
+      { 16128, 7730, 3918, 2083, 1819, 882, 190, 16, 1, 1 },
+      { 16256, 7728, 3890, 2056, 1783, 856, 182, 15, 1, 1 },
+      { 16384, 7725, 3862, 2029, 1747, 831, 174, 14, 1, 1 },
+      { 16512, 7721, 3833, 2002, 1712, 806, 167, 13, 1, 1 },
+      { 16640, 7717, 3804, 1975, 1677, 781, 160, 12, 1, 1 },
+      { 16768, 7712, 3775, 1947, 1642, 757, 153, 12, 1, 1 },
+      { 16896, 7706, 3745, 1920, 1608, 734, 146, 11, 1, 1 },
+      { 17024, 7699, 3714, 1893, 1575, 711, 140, 10, 1, 1 },
+      { 17152, 7690, 3684, 1866, 1541, 689, 134, 10, 1, 1 },
+      { 17280, 7681, 3653, 1839, 1508, 668, 128, 9, 1, 1 },
+      { 17408, 7671, 3621, 1812, 1476, 647, 122, 9, 1, 1 },
+      { 17536, 7660, 3590, 1785, 1444, 626, 117, 8, 1, 1 },
+      { 17664, 7648, 3558, 1758, 1412, 606, 112, 8, 1, 1 },
+      { 17792, 7635, 3526, 1731, 1381, 587, 107, 7, 1, 1 },
+      { 17920, 7622, 3493, 1704, 1350, 568, 102, 7, 1, 1 },
+      { 18048, 7607, 3461, 1678, 1319, 549, 98, 6, 1, 1 },
+      { 18176, 7592, 3428, 1651, 1289, 531, 93, 6, 1, 1 },
+      { 18304, 7575, 3394, 1625, 1259, 514, 89, 6, 1, 1 },
+      { 18432, 7558, 3361, 1598, 1230, 497, 85, 5, 1, 1 },
+      { 18560, 7540, 3327, 1572, 1201, 480, 81, 5, 1, 1 },
+      { 18688, 7520, 3293, 1546, 1173, 464, 77, 5, 1, 1 },
+      { 18816, 7500, 3258, 1520, 1145, 448, 74, 5, 1, 1 },
+      { 18944, 7480, 3224, 1494, 1117, 433, 70, 4, 1, 1 },
+      { 19072, 7458, 3189, 1468, 1090, 418, 67, 4, 1, 1 },
+      { 19200, 7435, 3154, 1442, 1063, 404, 64, 4, 1, 1 },
+      { 19328, 7410, 3119, 1417, 1037, 390, 61, 4, 1, 1 },
+      { 19456, 7386, 3084, 1392, 1011, 376, 58, 3, 1, 1 },
+      { 19584, 7361, 3048, 1366, 986, 363, 55, 3, 1, 1 },
+      { 19712, 7335, 3012, 1341, 960, 350, 53, 3, 1, 1 },
+      { 19840, 7307, 2977, 1316, 936, 337, 50, 3, 1, 1 },
+      { 19968, 7279, 2941, 1291, 911, 325, 48, 3, 1, 1 },
+      { 20096, 7251, 2905, 1267, 887, 313, 45, 2, 1, 1 },
+      { 20224, 7220, 2868, 1243, 864, 302, 43, 2, 1, 1 },
+      { 20352, 7189, 2832, 1218, 841, 291, 41, 2, 1, 1 },
+      { 20480, 7158, 2795, 1194, 818, 280, 39, 2, 1, 1 },
+      { 20608, 7124, 2759, 1170, 796, 270, 37, 2, 1, 1 },
+      { 20736, 7091, 2722, 1147, 774, 259, 35, 2, 1, 1 },
+      { 20864, 7056, 2685, 1123, 752, 250, 34, 2, 1, 1 },
+      { 20992, 7021, 2648, 1100, 731, 240, 32, 2, 1, 1 },
+      { 21120, 6985, 2612, 1077, 710, 231, 30, 1, 1, 1 },
+      { 21248, 6948, 2574, 1054, 690, 222, 29, 1, 1, 1 },
+      { 21376, 6911, 2537, 1031, 670, 213, 27, 1, 1, 1 },
+      { 21504, 6872, 2500, 1008, 650, 205, 26, 1, 1, 1 },
+      { 21632, 6831, 2463, 986, 631, 197, 25, 1, 1, 1 },
+      { 21760, 6791, 2426, 964, 612, 189, 23, 1, 1, 1 },
+      { 21888, 6749, 2389, 942, 594, 181, 22, 1, 1, 1 },
+      { 22016, 6707, 2351, 921, 575, 174, 21, 1, 1, 1 },
+      { 22144, 6663, 2314, 899, 558, 167, 20, 1, 1, 1 },
+      { 22272, 6619, 2277, 878, 540, 160, 19, 1, 1, 1 },
+      { 22400, 6574, 2240, 857, 523, 153, 18, 1, 1, 1 },
+      { 22528, 6529, 2202, 836, 507, 146, 17, 1, 1, 1 },
+      { 22656, 6482, 2165, 816, 490, 140, 16, 1, 1, 1 },
+      { 22784, 6435, 2128, 795, 474, 134, 15, 1, 1, 1 },
+      { 22912, 6386, 2091, 775, 459, 128, 14, 1, 1, 1 },
+      { 23040, 6336, 2054, 756, 443, 123, 13, 1, 1, 1 },
+      { 23168, 6286, 2017, 736, 428, 117, 13, 1, 1, 1 },
+      { 23296, 6234, 1980, 717, 414, 112, 12, 1, 1, 1 },
+      { 23424, 6183, 1943, 698, 399, 107, 11, 1, 1, 1 },
+      { 23552, 6130, 1906, 679, 385, 102, 11, 1, 1, 1 },
+      { 23680, 6077, 1869, 660, 372, 97, 10, 1, 1, 1 },
+      { 23808, 6022, 1833, 642, 358, 93, 9, 1, 1, 1 },
+      { 23936, 5966, 1796, 624, 345, 89, 9, 1, 1, 1 },
+      { 24064, 5910, 1760, 606, 333, 84, 8, 1, 1, 1 },
+      { 24192, 5853, 1724, 588, 320, 80, 8, 1, 1, 1 },
+      { 24320, 5796, 1687, 571, 308, 76, 7, 1, 1, 1 },
+      { 24448, 5735, 1651, 554, 297, 73, 7, 1, 1, 1 },
+      { 24576, 5677, 1615, 537, 285, 69, 6, 1, 1, 1 },
+      { 24704, 5615, 1579, 521, 274, 66, 6, 1, 1, 1 },
+      { 24832, 5554, 1544, 504, 263, 62, 6, 1, 1, 1 },
+      { 24960, 5492, 1508, 488, 253, 59, 5, 1, 1, 1 },
+      { 25088, 5428, 1473, 473, 242, 56, 5, 1, 1, 1 },
+      { 25216, 5364, 1438, 457, 232, 53, 5, 1, 1, 1 },
+      { 25344, 5300, 1403, 442, 222, 50, 4, 1, 1, 1 },
+      { 25472, 5233, 1368, 427, 213, 48, 4, 1, 1, 1 },
+      { 25600, 5166, 1334, 412, 204, 45, 4, 1, 1, 1 },
+      { 25728, 5098, 1299, 398, 195, 43, 4, 1, 1, 1 },
+      { 25856, 5030, 1266, 384, 186, 40, 3, 1, 1, 1 },
+      { 25984, 4960, 1232, 370, 178, 38, 3, 1, 1, 1 },
+      { 26112, 4890, 1198, 356, 170, 36, 3, 1, 1, 1 },
+      { 26240, 4819, 1164, 343, 162, 34, 3, 1, 1, 1 },
+      { 26368, 4748, 1132, 329, 154, 32, 2, 1, 1, 1 },
+      { 26496, 4675, 1098, 317, 147, 30, 2, 1, 1, 1 },
+      { 26624, 4602, 1066, 304, 139, 28, 2, 1, 1, 1 },
+      { 26752, 4527, 1034, 292, 132, 26, 2, 1, 1, 1 },
+      { 26880, 4451, 1001, 280, 126, 25, 2, 1, 1, 1 },
+      { 27008, 4375, 970, 268, 119, 23, 2, 1, 1, 1 },
+      { 27136, 4299, 938, 256, 113, 21, 2, 1, 1, 1 },
+      { 27264, 4221, 907, 245, 107, 20, 1, 1, 1, 1 },
+      { 27392, 4142, 876, 234, 101, 19, 1, 1, 1, 1 },
+      { 27520, 4063, 846, 223, 95, 17, 1, 1, 1, 1 },
+      { 27648, 3982, 815, 213, 90, 16, 1, 1, 1, 1 },
+      { 27776, 3900, 786, 202, 85, 15, 1, 1, 1, 1 },
+      { 27904, 3818, 756, 192, 80, 14, 1, 1, 1, 1 },
+      { 28032, 3734, 727, 183, 75, 13, 1, 1, 1, 1 },
+      { 28160, 3651, 698, 173, 70, 12, 1, 1, 1, 1 },
+      { 28288, 3566, 669, 164, 66, 11, 1, 1, 1, 1 },
+      { 28416, 3481, 641, 155, 61, 10, 1, 1, 1, 1 },
+      { 28544, 3393, 614, 147, 57, 9, 1, 1, 1, 1 },
+      { 28672, 3306, 586, 138, 53, 9, 1, 1, 1, 1 },
+      { 28800, 3217, 559, 130, 50, 8, 1, 1, 1, 1 },
+      { 28928, 3128, 533, 122, 46, 7, 1, 1, 1, 1 },
+      { 29056, 3037, 507, 114, 43, 7, 1, 1, 1, 1 },
+      { 29184, 2947, 481, 107, 39, 6, 1, 1, 1, 1 },
+      { 29312, 2855, 456, 100, 36, 5, 1, 1, 1, 1 },
+      { 29440, 2762, 431, 93, 33, 5, 1, 1, 1, 1 },
+      { 29568, 2668, 407, 86, 31, 4, 1, 1, 1, 1 },
+      { 29696, 2573, 383, 80, 28, 4, 1, 1, 1, 1 },
+      { 29824, 2478, 359, 74, 25, 4, 1, 1, 1, 1 },
+      { 29952, 2381, 337, 68, 23, 3, 1, 1, 1, 1 },
+      { 30080, 2284, 314, 62, 21, 3, 1, 1, 1, 1 },
+      { 30208, 2185, 293, 57, 19, 2, 1, 1, 1, 1 },
+      { 30336, 2086, 271, 52, 17, 2, 1, 1, 1, 1 },
+      { 30464, 1986, 250, 47, 15, 2, 1, 1, 1, 1 },
+      { 30592, 1885, 230, 42, 13, 2, 1, 1, 1, 1 },
+      { 30720, 1782, 211, 38, 12, 1, 1, 1, 1, 1 },
+      { 30848, 1679, 192, 34, 10, 1, 1, 1, 1, 1 },
+      { 30976, 1575, 173, 30, 9, 1, 1, 1, 1, 1 },
+      { 31104, 1469, 156, 26, 8, 1, 1, 1, 1, 1 },
+      { 31232, 1364, 138, 23, 6, 1, 1, 1, 1, 1 },
+      { 31360, 1257, 122, 19, 5, 1, 1, 1, 1, 1 },
+      { 31488, 1149, 106, 16, 4, 1, 1, 1, 1, 1 },
+      { 31616, 1038, 91, 14, 4, 1, 1, 1, 1, 1 },
+      { 31744, 928, 77, 11, 3, 1, 1, 1, 1, 1 },
+      { 31872, 816, 64, 9, 2, 1, 1, 1, 1, 1 },
+      { 32000, 703, 51, 7, 2, 1, 1, 1, 1, 1 },
+      { 32128, 589, 40, 5, 1, 1, 1, 1, 1, 1 },
+      { 32256, 473, 29, 4, 1, 1, 1, 1, 1, 1 },
+      { 32384, 357, 19, 2, 1, 1, 1, 1, 1, 1 },
+      { 32512, 238, 11, 1, 1, 1, 1, 1, 1, 1 },
+      { 32640, 117, 4, 1, 1, 1, 1, 1, 1, 1 },
     };
 #endif  // CONFIG_ANS
 

diff --git a/test/ans_test.cc b/test/ans_test.cc
index ba8e3c70edd154670aa495c135932fd95601e66c..74fdaf6e3f99221e37e9d68cf849b16d6d245814 100644 (file)
--- a/test/ans_test.cc
+++ b/test/ans_test.cc
@@ -74,7 +74,8 @@ bool check_uabs(const PvVec &pv_vec, uint8_t *buf) {
   return ans_read_end(&d);
 }
 
-const aom_cdf_prob spareto65[] = { 260, 188, 138, 102, 133, 122, 64, 15, 1, 1 };
+const aom_cdf_prob spareto65[] = { 8320, 6018, 4402, 3254, 4259,
+                                   3919, 2057, 492,  45,   2 };
 
 const int kRansSymbols =
     static_cast<int>(sizeof(spareto65) / sizeof(spareto65[0]));
@@ -94,7 +95,8 @@ std::vector<int> ans_encode_build_vals(rans_sym *const tab, int iters) {
   std::vector<int> ret;
   libaom_test::ACMRandom gen(18543637);
   for (int i = 0; i < iters; ++i) {
-    int sym = p_to_sym[gen.Rand8() * 4];
+    int sym =
+        p_to_sym[((gen.Rand8() << 8) + gen.Rand8()) & (RANS_PRECISION - 1)];
     ret.push_back(sym);
   }
   return ret;