[tcq] revert cdf for 1d and chroma to the original ones
STATS_CHANGED
diff --git a/av1/common/token_cdfs.h b/av1/common/token_cdfs.h
index bebca85..12b05d4 100644
--- a/av1/common/token_cdfs.h
+++ b/av1/common/token_cdfs.h
@@ -4399,6 +4399,212 @@
#if CONFIG_CHROMA_CODING
#if CONFIG_DQ
+#if TCQ_DIS_CHR
+static const aom_cdf_prob av1_default_coeff_base_lf_multi_uv_cdfs
+ [TOKEN_CDF_Q_CTXS][LF_SIG_COEF_CONTEXTS_UV][DQ_CTXS]
+ [CDF_SIZE(LF_BASE_SYMBOLS)] = {
+ {
+ {
+ { AOM_CDF6(14366, 26260, 30107, 31462, 31984), 6 },
+ { AOM_CDF6(14366, 26260, 30107, 31462, 31984), 6 },
+ },
+ {
+ { AOM_CDF6(8435, 20211, 26486, 29544, 30971), 75 },
+ { AOM_CDF6(8435, 20211, 26486, 29544, 30971), 75 },
+ },
+ {
+ { AOM_CDF6(4468, 12279, 18551, 23241, 26398), 118 },
+ { AOM_CDF6(4468, 12279, 18551, 23241, 26398), 118 },
+ },
+ {
+ { AOM_CDF6(2017, 5852, 9588, 13227, 16466), 90 },
+ { AOM_CDF6(2017, 5852, 9588, 13227, 16466), 90 },
+ },
+ {
+ { AOM_CDF6(13234, 26965, 30663, 31921, 32326), 6 },
+ { AOM_CDF6(13234, 26965, 30663, 31921, 32326), 6 },
+ },
+ {
+ { AOM_CDF6(9638, 23022, 28785, 31064, 31943), 118 },
+ { AOM_CDF6(9638, 23022, 28785, 31064, 31943), 118 },
+ },
+ {
+ { AOM_CDF6(5677, 15107, 21848, 26210, 28932), 90 },
+ { AOM_CDF6(5677, 15107, 21848, 26210, 28932), 90 },
+ },
+ {
+ { AOM_CDF6(2482, 7244, 11769, 15966, 19494), 0 },
+ { AOM_CDF6(2482, 7244, 11769, 15966, 19494), 0 },
+ },
+ {
+ { AOM_CDF6(26308, 32422, 32700, 32734, 32738), 0 },
+ { AOM_CDF6(26308, 32422, 32700, 32734, 32738), 0 },
+ },
+ {
+ { AOM_CDF6(18410, 31272, 32441, 32627, 32684), 80 },
+ { AOM_CDF6(18410, 31272, 32441, 32627, 32684), 80 },
+ },
+ {
+ { AOM_CDF6(9279, 21122, 27290, 29891, 30980), 2 },
+ { AOM_CDF6(9279, 21122, 27290, 29891, 30980), 2 },
+ },
+ {
+ { AOM_CDF6(5425, 11645, 15311, 18838, 21700), 24 },
+ { AOM_CDF6(5425, 11645, 15311, 18838, 21700), 24 },
+ },
+ },
+ {
+ {
+ { AOM_CDF6(15811, 26488, 30226, 31615, 32132), 6 },
+ { AOM_CDF6(15811, 26488, 30226, 31615, 32132), 6 },
+ },
+ {
+ { AOM_CDF6(8921, 21492, 27700, 30444, 31559), 75 },
+ { AOM_CDF6(8921, 21492, 27700, 30444, 31559), 75 },
+ },
+ {
+ { AOM_CDF6(4841, 13432, 20064, 24648, 27631), 93 },
+ { AOM_CDF6(4841, 13432, 20064, 24648, 27631), 93 },
+ },
+ {
+ { AOM_CDF6(2088, 6035, 9950, 13721, 17072), 118 },
+ { AOM_CDF6(2088, 6035, 9950, 13721, 17072), 118 },
+ },
+ {
+ { AOM_CDF6(15540, 27901, 31326, 32200, 32479), 0 },
+ { AOM_CDF6(15540, 27901, 31326, 32200, 32479), 0 },
+ },
+ {
+ { AOM_CDF6(10351, 24377, 29698, 31536, 32155), 75 },
+ { AOM_CDF6(10351, 24377, 29698, 31536, 32155), 75 },
+ },
+ {
+ { AOM_CDF6(5509, 15008, 21741, 26006, 28626), 90 },
+ { AOM_CDF6(5509, 15008, 21741, 26006, 28626), 90 },
+ },
+ {
+ { AOM_CDF6(2146, 6241, 10294, 14072, 17392), 115 },
+ { AOM_CDF6(2146, 6241, 10294, 14072, 17392), 115 },
+ },
+ {
+ { AOM_CDF6(27338, 32320, 32643, 32709, 32732), 93 },
+ { AOM_CDF6(27338, 32320, 32643, 32709, 32732), 93 },
+ },
+ {
+ { AOM_CDF6(17248, 30295, 31985, 32426, 32580), 90 },
+ { AOM_CDF6(17248, 30295, 31985, 32426, 32580), 90 },
+ },
+ {
+ { AOM_CDF6(7979, 18661, 24838, 28420, 30133), 90 },
+ { AOM_CDF6(7979, 18661, 24838, 28420, 30133), 90 },
+ },
+ {
+ { AOM_CDF6(4565, 11089, 15855, 19468, 22228), 16 },
+ { AOM_CDF6(4565, 11089, 15855, 19468, 22228), 16 },
+ },
+ },
+ {
+ {
+ { AOM_CDF6(14796, 27248, 30689, 31786, 32176), 1 },
+ { AOM_CDF6(14796, 27248, 30689, 31786, 32176), 1 },
+ },
+ {
+ { AOM_CDF6(8580, 21471, 27905, 30611, 31681), 75 },
+ { AOM_CDF6(8580, 21471, 27905, 30611, 31681), 75 },
+ },
+ {
+ { AOM_CDF6(4644, 13296, 20094, 24691, 27651), 118 },
+ { AOM_CDF6(4644, 13296, 20094, 24691, 27651), 118 },
+ },
+ {
+ { AOM_CDF6(1845, 5492, 9273, 13250, 16963), 123 },
+ { AOM_CDF6(1845, 5492, 9273, 13250, 16963), 123 },
+ },
+ {
+ { AOM_CDF6(15149, 27491, 30644, 31724, 32177), 0 },
+ { AOM_CDF6(15149, 27491, 30644, 31724, 32177), 0 },
+ },
+ {
+ { AOM_CDF6(8469, 21408, 27928, 30603, 31665), 118 },
+ { AOM_CDF6(8469, 21408, 27928, 30603, 31665), 118 },
+ },
+ {
+ { AOM_CDF6(4538, 12465, 18903, 23659, 26874), 93 },
+ { AOM_CDF6(4538, 12465, 18903, 23659, 26874), 93 },
+ },
+ {
+ { AOM_CDF6(1812, 5425, 9106, 12838, 16349), 115 },
+ { AOM_CDF6(1812, 5425, 9106, 12838, 16349), 115 },
+ },
+ {
+ { AOM_CDF6(27658, 32396, 32681, 32736, 32740), 75 },
+ { AOM_CDF6(27658, 32396, 32681, 32736, 32740), 75 },
+ },
+ {
+ { AOM_CDF6(17508, 30543, 32263, 32604, 32687), 115 },
+ { AOM_CDF6(17508, 30543, 32263, 32604, 32687), 115 },
+ },
+ {
+ { AOM_CDF6(8627, 20222, 26962, 30179, 31545), 77 },
+ { AOM_CDF6(8627, 20222, 26962, 30179, 31545), 77 },
+ },
+ {
+ { AOM_CDF6(4502, 11287, 17510, 22262, 25858), 79 },
+ { AOM_CDF6(4502, 11287, 17510, 22262, 25858), 79 },
+ },
+ },
+ {
+ {
+ { AOM_CDF6(12028, 25805, 30242, 31686, 32104), 14 },
+ { AOM_CDF6(12028, 25805, 30242, 31686, 32104), 14 },
+ },
+ {
+ { AOM_CDF6(6873, 20683, 28552, 31327, 32198), 75 },
+ { AOM_CDF6(6873, 20683, 28552, 31327, 32198), 75 },
+ },
+ {
+ { AOM_CDF6(4417, 13376, 21020, 26076, 29345), 99 },
+ { AOM_CDF6(4417, 13376, 21020, 26076, 29345), 99 },
+ },
+ {
+ { AOM_CDF6(1872, 5776, 10779, 15967, 20663), 120 },
+ { AOM_CDF6(1872, 5776, 10779, 15967, 20663), 120 },
+ },
+ {
+ { AOM_CDF6(12010, 25672, 30138, 31773, 32134), 35 },
+ { AOM_CDF6(12010, 25672, 30138, 31773, 32134), 35 },
+ },
+ {
+ { AOM_CDF6(7029, 21007, 28934, 31567, 32294), 90 },
+ { AOM_CDF6(7029, 21007, 28934, 31567, 32294), 90 },
+ },
+ {
+ { AOM_CDF6(4309, 12652, 20158, 25517, 29022), 76 },
+ { AOM_CDF6(4309, 12652, 20158, 25517, 29022), 76 },
+ },
+ {
+ { AOM_CDF6(2072, 6184, 10807, 15838, 20961), 75 },
+ { AOM_CDF6(2072, 6184, 10807, 15838, 20961), 75 },
+ },
+ {
+ { AOM_CDF6(29343, 32431, 32638, 32716, 32732), 45 },
+ { AOM_CDF6(29343, 32431, 32638, 32716, 32732), 45 },
+ },
+ {
+ { AOM_CDF6(18659, 30546, 32380, 32697, 32732), 100 },
+ { AOM_CDF6(18659, 30546, 32380, 32697, 32732), 100 },
+ },
+ {
+ { AOM_CDF6(5958, 8937, 23831, 26810, 28300), 100 },
+ { AOM_CDF6(5958, 8937, 23831, 26810, 28300), 100 },
+ },
+ {
+ { AOM_CDF6(4681, 9362, 14043, 18725, 28087), 0 },
+ { AOM_CDF6(4681, 9362, 14043, 18725, 28087), 0 },
+ },
+ },
+ };
+#else
static const aom_cdf_prob av1_default_coeff_base_lf_multi_uv_cdfs
[TOKEN_CDF_Q_CTXS][LF_SIG_COEF_CONTEXTS_UV][DQ_CTXS]
[CDF_SIZE(LF_BASE_SYMBOLS)] = {
@@ -4603,6 +4809,7 @@
},
},
};
+#endif
#else
static const aom_cdf_prob av1_default_coeff_base_lf_multi_uv_cdfs
[TOKEN_CDF_Q_CTXS][LF_SIG_COEF_CONTEXTS_UV][CDF_SIZE(LF_BASE_SYMBOLS)] = {
@@ -4710,6 +4917,211 @@
};
#if CONFIG_DQ
+#if TCQ_DIS_CHR
+static const aom_cdf_prob
+ av1_default_coeff_base_multi_uv_cdfs[4][12][2][CDF_SIZE(4)] = {
+ {
+ {
+ { AOM_CDF4(26007, 32241, 32639), 0 },
+ { AOM_CDF4(26007, 32241, 32639), 0 },
+ },
+ {
+ { AOM_CDF4(17365, 29572, 31911), 90 },
+ { AOM_CDF4(17365, 29572, 31911), 90 },
+ },
+ {
+ { AOM_CDF4(8543, 21075, 27313), 75 },
+ { AOM_CDF4(8543, 21075, 27313), 75 },
+ },
+ {
+ { AOM_CDF4(4393, 12441, 18915), 76 },
+ { AOM_CDF4(4393, 12441, 18915), 76 },
+ },
+ {
+ { AOM_CDF4(26852, 32428, 32678), 75 },
+ { AOM_CDF4(26852, 32428, 32678), 75 },
+ },
+ {
+ { AOM_CDF4(18225, 30513, 32242), 120 },
+ { AOM_CDF4(18225, 30513, 32242), 120 },
+ },
+ {
+ { AOM_CDF4(9602, 22923, 28632), 75 },
+ { AOM_CDF4(9602, 22923, 28632), 75 },
+ },
+ {
+ { AOM_CDF4(4728, 13291, 19961), 15 },
+ { AOM_CDF4(4728, 13291, 19961), 15 },
+ },
+ {
+ { AOM_CDF4(28239, 32612, 32732), 105 },
+ { AOM_CDF4(28239, 32612, 32732), 105 },
+ },
+ {
+ { AOM_CDF4(21777, 31920, 32593), 75 },
+ { AOM_CDF4(21777, 31920, 32593), 75 },
+ },
+ {
+ { AOM_CDF4(10167, 22287, 27755), 20 },
+ { AOM_CDF4(10167, 22287, 27755), 20 },
+ },
+ {
+ { AOM_CDF4(3763, 10274, 17843), 84 },
+ { AOM_CDF4(3763, 10274, 17843), 84 },
+ },
+ },
+ {
+ {
+ { AOM_CDF4(26071, 32361, 32667), 75 },
+ { AOM_CDF4(26071, 32361, 32667), 75 },
+ },
+ {
+ { AOM_CDF4(16124, 29499, 31947), 75 },
+ { AOM_CDF4(16124, 29499, 31947), 75 },
+ },
+ {
+ { AOM_CDF4(8857, 21690, 27718), 75 },
+ { AOM_CDF4(8857, 21690, 27718), 75 },
+ },
+ {
+ { AOM_CDF4(4563, 12848, 19240), 75 },
+ { AOM_CDF4(4563, 12848, 19240), 75 },
+ },
+ {
+ { AOM_CDF4(27210, 32509, 32703), 0 },
+ { AOM_CDF4(27210, 32509, 32703), 0 },
+ },
+ {
+ { AOM_CDF4(17974, 30478, 32206), 75 },
+ { AOM_CDF4(17974, 30478, 32206), 75 },
+ },
+ {
+ { AOM_CDF4(9325, 22310, 28033), 75 },
+ { AOM_CDF4(9325, 22310, 28033), 75 },
+ },
+ {
+ { AOM_CDF4(4214, 11861, 18089), 75 },
+ { AOM_CDF4(4214, 11861, 18089), 75 },
+ },
+ {
+ { AOM_CDF4(28512, 32439, 32684), 75 },
+ { AOM_CDF4(28512, 32439, 32684), 75 },
+ },
+ {
+ { AOM_CDF4(19918, 30794, 32233), 90 },
+ { AOM_CDF4(19918, 30794, 32233), 90 },
+ },
+ {
+ { AOM_CDF4(8545, 20451, 26400), 5 },
+ { AOM_CDF4(8545, 20451, 26400), 5 },
+ },
+ {
+ { AOM_CDF4(3297, 10809, 17416), 96 },
+ { AOM_CDF4(3297, 10809, 17416), 96 },
+ },
+ },
+ {
+ {
+ { AOM_CDF4(26847, 32431, 32693), 75 },
+ { AOM_CDF4(26847, 32431, 32693), 75 },
+ },
+ {
+ { AOM_CDF4(16626, 29898, 32086), 75 },
+ { AOM_CDF4(16626, 29898, 32086), 75 },
+ },
+ {
+ { AOM_CDF4(9575, 22628, 28255), 75 },
+ { AOM_CDF4(9575, 22628, 28255), 75 },
+ },
+ {
+ { AOM_CDF4(4790, 13131, 19545), 76 },
+ { AOM_CDF4(4790, 13131, 19545), 76 },
+ },
+ {
+ { AOM_CDF4(26405, 32274, 32665), 75 },
+ { AOM_CDF4(26405, 32274, 32665), 75 },
+ },
+ {
+ { AOM_CDF4(15958, 29449, 31888), 75 },
+ { AOM_CDF4(15958, 29449, 31888), 75 },
+ },
+ {
+ { AOM_CDF4(9027, 21837, 27644), 1 },
+ { AOM_CDF4(9027, 21837, 27644), 1 },
+ },
+ {
+ { AOM_CDF4(4555, 12639, 18997), 1 },
+ { AOM_CDF4(4555, 12639, 18997), 1 },
+ },
+ {
+ { AOM_CDF4(29803, 32664, 32748), 75 },
+ { AOM_CDF4(29803, 32664, 32748), 75 },
+ },
+ {
+ { AOM_CDF4(21668, 31797, 32594), 115 },
+ { AOM_CDF4(21668, 31797, 32594), 115 },
+ },
+ {
+ { AOM_CDF4(10619, 23941, 29332), 76 },
+ { AOM_CDF4(10619, 23941, 29332), 76 },
+ },
+ {
+ { AOM_CDF4(3730, 9857, 15718), 100 },
+ { AOM_CDF4(3730, 9857, 15718), 100 },
+ },
+ },
+ {
+ {
+ { AOM_CDF4(26525, 32419, 32724), 75 },
+ { AOM_CDF4(26525, 32419, 32724), 75 },
+ },
+ {
+ { AOM_CDF4(13626, 29583, 32261), 75 },
+ { AOM_CDF4(13626, 29583, 32261), 75 },
+ },
+ {
+ { AOM_CDF4(9014, 23415, 29326), 7 },
+ { AOM_CDF4(9014, 23415, 29326), 7 },
+ },
+ {
+ { AOM_CDF4(5308, 16384, 23590), 75 },
+ { AOM_CDF4(5308, 16384, 23590), 75 },
+ },
+ {
+ { AOM_CDF4(25016, 32329, 32719), 75 },
+ { AOM_CDF4(25016, 32329, 32719), 75 },
+ },
+ {
+ { AOM_CDF4(14001, 29360, 32145), 75 },
+ { AOM_CDF4(14001, 29360, 32145), 75 },
+ },
+ {
+ { AOM_CDF4(8594, 22169, 28754), 9 },
+ { AOM_CDF4(8594, 22169, 28754), 9 },
+ },
+ {
+ { AOM_CDF4(5179, 14375, 22253), 95 },
+ { AOM_CDF4(5179, 14375, 22253), 95 },
+ },
+ {
+ { AOM_CDF4(30742, 32620, 32719), 110 },
+ { AOM_CDF4(30742, 32620, 32719), 110 },
+ },
+ {
+ { AOM_CDF4(24363, 31917, 32449), 0 },
+ { AOM_CDF4(24363, 31917, 32449), 0 },
+ },
+ {
+ { AOM_CDF4(12288, 24576, 28672), 0 },
+ { AOM_CDF4(12288, 24576, 28672), 0 },
+ },
+ {
+ { AOM_CDF4(8192, 16384, 24576), 0 },
+ { AOM_CDF4(8192, 16384, 24576), 0 },
+ },
+ },
+ };
+#else
static const aom_cdf_prob
av1_default_coeff_base_multi_uv_cdfs[4][12][2][CDF_SIZE(4)] = {
{
@@ -4913,6 +5325,7 @@
},
},
};
+#endif
#else
static const aom_cdf_prob av1_default_coeff_base_multi_uv_cdfs
[TOKEN_CDF_Q_CTXS][SIG_COEF_CONTEXTS_UV][CDF_SIZE(NUM_BASE_LEVELS + 2)] = {
@@ -5152,6 +5565,56 @@
{ AOM_CDF6(2484, 7270, 11890, 15920, 19658), 123 },
{ AOM_CDF6(805, 5094, 9946, 14452, 18092), 123 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(18832, 29501, 31412, 32019, 32234), 5 },
+ { AOM_CDF6(18832, 29501, 31412, 32019, 32234), 5 },
+ },
+ {
+ { AOM_CDF6(12192, 25324, 29644, 31121, 31692), 90 },
+ { AOM_CDF6(12192, 25324, 29644, 31121, 31692), 90 },
+ },
+ {
+ { AOM_CDF6(7297, 18053, 24620, 28179, 29856), 75 },
+ { AOM_CDF6(7297, 18053, 24620, 28179, 29856), 75 },
+ },
+ {
+ { AOM_CDF6(6351, 14261, 20044, 23900, 26371), 75 },
+ { AOM_CDF6(6351, 14261, 20044, 23900, 26371), 75 },
+ },
+ {
+ { AOM_CDF6(3044, 8507, 13554, 17700, 20847), 75 },
+ { AOM_CDF6(3044, 8507, 13554, 17700, 20847), 75 },
+ },
+ {
+ { AOM_CDF6(2125, 5665, 9347, 12830, 15909), 100 },
+ { AOM_CDF6(2125, 5665, 9347, 12830, 15909), 100 },
+ },
+ {
+ { AOM_CDF6(1310, 3647, 6103, 8479, 10724), 124 },
+ { AOM_CDF6(1310, 3647, 6103, 8479, 10724), 124 },
+ },
+ {
+ { AOM_CDF6(24974, 32003, 32552, 32665, 32700), 0 },
+ { AOM_CDF6(24974, 32003, 32552, 32665, 32700), 0 },
+ },
+ {
+ { AOM_CDF6(14816, 26797, 30763, 31884, 32258), 90 },
+ { AOM_CDF6(14816, 26797, 30763, 31884, 32258), 90 },
+ },
+ {
+ { AOM_CDF6(7599, 17322, 23806, 27634, 29698), 75 },
+ { AOM_CDF6(7599, 17322, 23806, 27634, 29698), 75 },
+ },
+ {
+ { AOM_CDF6(7103, 14637, 20025, 23706, 26319), 90 },
+ { AOM_CDF6(7103, 14637, 20025, 23706, 26319), 90 },
+ },
+ {
+ { AOM_CDF6(2520, 6946, 11110, 14689, 17772), 93 },
+ { AOM_CDF6(2520, 6946, 11110, 14689, 17772), 93 },
+ },
+#else
{
{ AOM_CDF6(17312, 29865, 31400, 32310, 32333), 115 },
{ AOM_CDF6(9059, 24120, 30505, 31622, 32224), 20 },
@@ -5200,6 +5663,7 @@
{ AOM_CDF6(1771, 6054, 10829, 14775, 17959), 78 },
{ AOM_CDF6(752, 4271, 8403, 12906, 15881), 75 },
},
+#endif
},
{
{
@@ -5286,6 +5750,56 @@
{ AOM_CDF6(3275, 9601, 15013, 19461, 22814), 93 },
{ AOM_CDF6(405, 6336, 12573, 17560, 21302), 90 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(26290, 32021, 32468, 32597, 32646), 0 },
+ { AOM_CDF6(26290, 32021, 32468, 32597, 32646), 0 },
+ },
+ {
+ { AOM_CDF6(16555, 29135, 31552, 32191, 32400), 90 },
+ { AOM_CDF6(16555, 29135, 31552, 32191, 32400), 90 },
+ },
+ {
+ { AOM_CDF6(10084, 22847, 28258, 30456, 31389), 75 },
+ { AOM_CDF6(10084, 22847, 28258, 30456, 31389), 75 },
+ },
+ {
+ { AOM_CDF6(6977, 16792, 22984, 26486, 28437), 1 },
+ { AOM_CDF6(6977, 16792, 22984, 26486, 28437), 1 },
+ },
+ {
+ { AOM_CDF6(4056, 11507, 17511, 21910, 24827), 75 },
+ { AOM_CDF6(4056, 11507, 17511, 21910, 24827), 75 },
+ },
+ {
+ { AOM_CDF6(2994, 8463, 13359, 17473, 20660), 90 },
+ { AOM_CDF6(2994, 8463, 13359, 17473, 20660), 90 },
+ },
+ {
+ { AOM_CDF6(1685, 4842, 8021, 10948, 13523), 93 },
+ { AOM_CDF6(1685, 4842, 8021, 10948, 13523), 93 },
+ },
+ {
+ { AOM_CDF6(28016, 32504, 32702, 32736, 32740), 0 },
+ { AOM_CDF6(28016, 32504, 32702, 32736, 32740), 0 },
+ },
+ {
+ { AOM_CDF6(18602, 30203, 32140, 32521, 32633), 103 },
+ { AOM_CDF6(18602, 30203, 32140, 32521, 32633), 103 },
+ },
+ {
+ { AOM_CDF6(11272, 24591, 29571, 31334, 31982), 75 },
+ { AOM_CDF6(11272, 24591, 29571, 31334, 31982), 75 },
+ },
+ {
+ { AOM_CDF6(8093, 19452, 25731, 28891, 30469), 75 },
+ { AOM_CDF6(8093, 19452, 25731, 28891, 30469), 75 },
+ },
+ {
+ { AOM_CDF6(4041, 11262, 17038, 21210, 24054), 75 },
+ { AOM_CDF6(4041, 11262, 17038, 21210, 24054), 75 },
+ },
+#else
{
{ AOM_CDF6(26657, 32344, 32640, 32705, 32712), 116 },
{ AOM_CDF6(22362, 29644, 32028, 32464, 32585), 118 },
@@ -5334,6 +5848,7 @@
{ AOM_CDF6(3657, 11549, 17275, 21645, 24491), 75 },
{ AOM_CDF6(1136, 8244, 15202, 20041, 23136), 90 },
},
+#endif
},
{
{
@@ -5420,6 +5935,56 @@
{ AOM_CDF6(3003, 9500, 14783, 18864, 22122), 93 },
{ AOM_CDF6(929, 6621, 12508, 17355, 20822), 78 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(29917, 32597, 32714, 32736, 32740), 75 },
+ { AOM_CDF6(29917, 32597, 32714, 32736, 32740), 75 },
+ },
+ {
+ { AOM_CDF6(19705, 30884, 32225, 32522, 32634), 75 },
+ { AOM_CDF6(19705, 30884, 32225, 32522, 32634), 75 },
+ },
+ {
+ { AOM_CDF6(11771, 25242, 29797, 31373, 32032), 6 },
+ { AOM_CDF6(11771, 25242, 29797, 31373, 32032), 6 },
+ },
+ {
+ { AOM_CDF6(7884, 18463, 24730, 28017, 29624), 31 },
+ { AOM_CDF6(7884, 18463, 24730, 28017, 29624), 31 },
+ },
+ {
+ { AOM_CDF6(4570, 13155, 19787, 24244, 27010), 46 },
+ { AOM_CDF6(4570, 13155, 19787, 24244, 27010), 46 },
+ },
+ {
+ { AOM_CDF6(3458, 10299, 16096, 20513, 23626), 9 },
+ { AOM_CDF6(3458, 10299, 16096, 20513, 23626), 9 },
+ },
+ {
+ { AOM_CDF6(2441, 6850, 11016, 14883, 17913), 22 },
+ { AOM_CDF6(2441, 6850, 11016, 14883, 17913), 22 },
+ },
+ {
+ { AOM_CDF6(30912, 32721, 32740, 32744, 32748), 85 },
+ { AOM_CDF6(30912, 32721, 32740, 32744, 32748), 85 },
+ },
+ {
+ { AOM_CDF6(22569, 31800, 32564, 32703, 32732), 75 },
+ { AOM_CDF6(22569, 31800, 32564, 32703, 32732), 75 },
+ },
+ {
+ { AOM_CDF6(13855, 27736, 31221, 32193, 32506), 5 },
+ { AOM_CDF6(13855, 27736, 31221, 32193, 32506), 5 },
+ },
+ {
+ { AOM_CDF6(8984, 21588, 28059, 30514, 31533), 84 },
+ { AOM_CDF6(8984, 21588, 28059, 30514, 31533), 84 },
+ },
+ {
+ { AOM_CDF6(4850, 13293, 20179, 24556, 27375), 116 },
+ { AOM_CDF6(4850, 13293, 20179, 24556, 27375), 116 },
+ },
+#else
{
{ AOM_CDF6(29977, 32695, 32740, 32744, 32748), 10 },
{ AOM_CDF6(21325, 31848, 32576, 32728, 32732), 75 },
@@ -5468,6 +6033,7 @@
{ AOM_CDF6(3641, 10797, 15945, 21469, 24105), 85 },
{ AOM_CDF6(1536, 10112, 16896, 20864, 23296), 20 },
},
+#endif
},
{
{
@@ -5824,6 +6390,56 @@
{ AOM_CDF6(2487, 7388, 11938, 16081, 19636), 79 },
{ AOM_CDF6(632, 4523, 9442, 13865, 17726), 78 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(19957, 30881, 32093, 32401, 32499), 75 },
+ { AOM_CDF6(19957, 30881, 32093, 32401, 32499), 75 },
+ },
+ {
+ { AOM_CDF6(13862, 27524, 30931, 31847, 32161), 118 },
+ { AOM_CDF6(13862, 27524, 30931, 31847, 32161), 118 },
+ },
+ {
+ { AOM_CDF6(7951, 19522, 26221, 29500, 30783), 75 },
+ { AOM_CDF6(7951, 19522, 26221, 29500, 30783), 75 },
+ },
+ {
+ { AOM_CDF6(6740, 15489, 21710, 25768, 27994), 75 },
+ { AOM_CDF6(6740, 15489, 21710, 25768, 27994), 75 },
+ },
+ {
+ { AOM_CDF6(3517, 9766, 15604, 20263, 23629), 78 },
+ { AOM_CDF6(3517, 9766, 15604, 20263, 23629), 78 },
+ },
+ {
+ { AOM_CDF6(2514, 6923, 11453, 15483, 18838), 90 },
+ { AOM_CDF6(2514, 6923, 11453, 15483, 18838), 90 },
+ },
+ {
+ { AOM_CDF6(1575, 4396, 7421, 10439, 13122), 115 },
+ { AOM_CDF6(1575, 4396, 7421, 10439, 13122), 115 },
+ },
+ {
+ { AOM_CDF6(26753, 32413, 32653, 32715, 32732), 75 },
+ { AOM_CDF6(26753, 32413, 32653, 32715, 32732), 75 },
+ },
+ {
+ { AOM_CDF6(16486, 27781, 31508, 32297, 32527), 90 },
+ { AOM_CDF6(16486, 27781, 31508, 32297, 32527), 90 },
+ },
+ {
+ { AOM_CDF6(8468, 18731, 25262, 29033, 30854), 75 },
+ { AOM_CDF6(8468, 18731, 25262, 29033, 30854), 75 },
+ },
+ {
+ { AOM_CDF6(7679, 16687, 22428, 25871, 28305), 93 },
+ { AOM_CDF6(7679, 16687, 22428, 25871, 28305), 93 },
+ },
+ {
+ { AOM_CDF6(3330, 9195, 14353, 18336, 21471), 78 },
+ { AOM_CDF6(3330, 9195, 14353, 18336, 21471), 78 },
+ },
+#else
{
{ AOM_CDF6(17727, 29311, 31495, 32308, 32394), 75 },
{ AOM_CDF6(6217, 23353, 28895, 31068, 31825), 75 },
@@ -5872,6 +6488,7 @@
{ AOM_CDF6(2019, 6499, 11312, 15078, 17871), 79 },
{ AOM_CDF6(480, 4349, 8920, 12345, 16045), 83 },
},
+#endif
},
{
{
@@ -5958,6 +6575,56 @@
{ AOM_CDF6(3442, 9938, 15390, 19682, 22909), 78 },
{ AOM_CDF6(368, 6602, 12644, 17584, 21317), 3 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(27962, 32440, 32644, 32700, 32719), 75 },
+ { AOM_CDF6(27962, 32440, 32644, 32700, 32719), 75 },
+ },
+ {
+ { AOM_CDF6(17649, 30227, 32072, 32459, 32572), 90 },
+ { AOM_CDF6(17649, 30227, 32072, 32459, 32572), 90 },
+ },
+ {
+ { AOM_CDF6(10838, 24277, 29419, 31247, 31906), 75 },
+ { AOM_CDF6(10838, 24277, 29419, 31247, 31906), 75 },
+ },
+ {
+ { AOM_CDF6(7189, 17877, 24471, 27927, 29660), 75 },
+ { AOM_CDF6(7189, 17877, 24471, 27927, 29660), 75 },
+ },
+ {
+ { AOM_CDF6(4369, 12444, 19031, 23624, 26498), 15 },
+ { AOM_CDF6(4369, 12444, 19031, 23624, 26498), 15 },
+ },
+ {
+ { AOM_CDF6(3187, 9258, 14817, 19352, 22697), 75 },
+ { AOM_CDF6(3187, 9258, 14817, 19352, 22697), 75 },
+ },
+ {
+ { AOM_CDF6(2083, 5866, 9714, 13201, 16204), 90 },
+ { AOM_CDF6(2083, 5866, 9714, 13201, 16204), 90 },
+ },
+ {
+ { AOM_CDF6(29243, 32638, 32734, 32738, 32742), 0 },
+ { AOM_CDF6(29243, 32638, 32734, 32738, 32742), 0 },
+ },
+ {
+ { AOM_CDF6(19686, 30972, 32412, 32638, 32703), 75 },
+ { AOM_CDF6(19686, 30972, 32412, 32638, 32703), 75 },
+ },
+ {
+ { AOM_CDF6(11953, 25789, 30425, 31863, 32324), 75 },
+ { AOM_CDF6(11953, 25789, 30425, 31863, 32324), 75 },
+ },
+ {
+ { AOM_CDF6(8156, 20260, 26854, 29902, 31236), 75 },
+ { AOM_CDF6(8156, 20260, 26854, 29902, 31236), 75 },
+ },
+ {
+ { AOM_CDF6(4774, 13186, 19753, 24154, 26962), 75 },
+ { AOM_CDF6(4774, 13186, 19753, 24154, 26962), 75 },
+ },
+#else
{
{ AOM_CDF6(28187, 32364, 32620, 32712, 32732), 0 },
{ AOM_CDF6(25157, 30844, 32324, 32556, 32644), 0 },
@@ -6006,6 +6673,7 @@
{ AOM_CDF6(3497, 10737, 16003, 20080, 23290), 75 },
{ AOM_CDF6(738, 6927, 13194, 18007, 21479), 90 },
},
+#endif
},
{
{
@@ -6092,6 +6760,56 @@
{ AOM_CDF6(3875, 11272, 17192, 21524, 24517), 75 },
{ AOM_CDF6(250, 7725, 14392, 19419, 22992), 75 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(30513, 32660, 32735, 32739, 32743), 75 },
+ { AOM_CDF6(30513, 32660, 32735, 32739, 32743), 75 },
+ },
+ {
+ { AOM_CDF6(19741, 31317, 32435, 32635, 32696), 75 },
+ { AOM_CDF6(19741, 31317, 32435, 32635, 32696), 75 },
+ },
+ {
+ { AOM_CDF6(12474, 26518, 30757, 31972, 32360), 1 },
+ { AOM_CDF6(12474, 26518, 30757, 31972, 32360), 1 },
+ },
+ {
+ { AOM_CDF6(8024, 19833, 26418, 29417, 30720), 31 },
+ { AOM_CDF6(8024, 19833, 26418, 29417, 30720), 31 },
+ },
+ {
+ { AOM_CDF6(5339, 14743, 21943, 26369, 28810), 1 },
+ { AOM_CDF6(5339, 14743, 21943, 26369, 28810), 1 },
+ },
+ {
+ { AOM_CDF6(4118, 11547, 18150, 22872, 26018), 2 },
+ { AOM_CDF6(4118, 11547, 18150, 22872, 26018), 2 },
+ },
+ {
+ { AOM_CDF6(2921, 8227, 13156, 17466, 20816), 31 },
+ { AOM_CDF6(2921, 8227, 13156, 17466, 20816), 31 },
+ },
+ {
+ { AOM_CDF6(31197, 32729, 32740, 32744, 32748), 75 },
+ { AOM_CDF6(31197, 32729, 32740, 32744, 32748), 75 },
+ },
+ {
+ { AOM_CDF6(22157, 32007, 32636, 32730, 32734), 75 },
+ { AOM_CDF6(22157, 32007, 32636, 32730, 32734), 75 },
+ },
+ {
+ { AOM_CDF6(14153, 28311, 31723, 32428, 32619), 90 },
+ { AOM_CDF6(14153, 28311, 31723, 32428, 32619), 90 },
+ },
+ {
+ { AOM_CDF6(8964, 22454, 28710, 31129, 32018), 95 },
+ { AOM_CDF6(8964, 22454, 28710, 31129, 32018), 95 },
+ },
+ {
+ { AOM_CDF6(5502, 15192, 22260, 26601, 29088), 1 },
+ { AOM_CDF6(5502, 15192, 22260, 26601, 29088), 1 },
+ },
+#else
{
{ AOM_CDF6(29463, 32687, 32740, 32744, 32748), 1 },
{ AOM_CDF6(30060, 32241, 32687, 32733, 32737), 2 },
@@ -6140,6 +6858,7 @@
{ AOM_CDF6(2676, 12693, 19888, 23658, 26395), 25 },
{ AOM_CDF6(2724, 9352, 16239, 21594, 25597), 0 },
},
+#endif
},
{
{
@@ -6496,6 +7215,56 @@
{ AOM_CDF6(4805, 13231, 19767, 24730, 28488), 78 },
{ AOM_CDF6(392, 7136, 15755, 22803, 27395), 79 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(23001, 31002, 32088, 32414, 32533), 75 },
+ { AOM_CDF6(23001, 31002, 32088, 32414, 32533), 75 },
+ },
+ {
+ { AOM_CDF6(13016, 26663, 30462, 31649, 32090), 93 },
+ { AOM_CDF6(13016, 26663, 30462, 31649, 32090), 93 },
+ },
+ {
+ { AOM_CDF6(8120, 18424, 25072, 28576, 30186), 75 },
+ { AOM_CDF6(8120, 18424, 25072, 28576, 30186), 75 },
+ },
+ {
+ { AOM_CDF6(6827, 14574, 20370, 24129, 26517), 115 },
+ { AOM_CDF6(6827, 14574, 20370, 24129, 26517), 115 },
+ },
+ {
+ { AOM_CDF6(2718, 7699, 12922, 17322, 20773), 75 },
+ { AOM_CDF6(2718, 7699, 12922, 17322, 20773), 75 },
+ },
+ {
+ { AOM_CDF6(1747, 5672, 9462, 12967, 16209), 3 },
+ { AOM_CDF6(1747, 5672, 9462, 12967, 16209), 3 },
+ },
+ {
+ { AOM_CDF6(1058, 3245, 5643, 8186, 10793), 124 },
+ { AOM_CDF6(1058, 3245, 5643, 8186, 10793), 124 },
+ },
+ {
+ { AOM_CDF6(28877, 32461, 32685, 32733, 32737), 75 },
+ { AOM_CDF6(28877, 32461, 32685, 32733, 32737), 75 },
+ },
+ {
+ { AOM_CDF6(16158, 27458, 31241, 32250, 32529), 90 },
+ { AOM_CDF6(16158, 27458, 31241, 32250, 32529), 90 },
+ },
+ {
+ { AOM_CDF6(9349, 18871, 25289, 29138, 30802), 75 },
+ { AOM_CDF6(9349, 18871, 25289, 29138, 30802), 75 },
+ },
+ {
+ { AOM_CDF6(7699, 16203, 21865, 25564, 28151), 98 },
+ { AOM_CDF6(7699, 16203, 21865, 25564, 28151), 98 },
+ },
+ {
+ { AOM_CDF6(3777, 9327, 13955, 18482, 22279), 93 },
+ { AOM_CDF6(3777, 9327, 13955, 18482, 22279), 93 },
+ },
+#else
{
{ AOM_CDF6(21983, 31523, 32451, 32565, 32597), 1 },
{ AOM_CDF6(7915, 26221, 31335, 32162, 32396), 18 },
@@ -6544,6 +7313,7 @@
{ AOM_CDF6(2583, 7556, 16083, 20862, 24333), 4 },
{ AOM_CDF6(226, 6279, 12475, 17646, 22868), 10 },
},
+#endif
},
{
{
@@ -6630,6 +7400,56 @@
{ AOM_CDF6(4597, 13368, 20248, 25108, 28086), 78 },
{ AOM_CDF6(98, 8889, 16780, 22652, 26736), 78 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(29681, 32477, 32658, 32712, 32731), 75 },
+ { AOM_CDF6(29681, 32477, 32658, 32712, 32731), 75 },
+ },
+ {
+ { AOM_CDF6(16011, 29320, 31832, 32399, 32555), 115 },
+ { AOM_CDF6(16011, 29320, 31832, 32399, 32555), 115 },
+ },
+ {
+ { AOM_CDF6(9294, 21806, 27768, 30409, 31521), 90 },
+ { AOM_CDF6(9294, 21806, 27768, 30409, 31521), 90 },
+ },
+ {
+ { AOM_CDF6(6107, 14952, 21511, 25626, 28146), 75 },
+ { AOM_CDF6(6107, 14952, 21511, 25626, 28146), 75 },
+ },
+ {
+ { AOM_CDF6(2990, 9058, 15121, 20098, 23744), 90 },
+ { AOM_CDF6(2990, 9058, 15121, 20098, 23744), 90 },
+ },
+ {
+ { AOM_CDF6(2157, 6562, 11095, 15323, 19234), 75 },
+ { AOM_CDF6(2157, 6562, 11095, 15323, 19234), 75 },
+ },
+ {
+ { AOM_CDF6(1346, 3906, 6845, 9832, 12783), 90 },
+ { AOM_CDF6(1346, 3906, 6845, 9832, 12783), 90 },
+ },
+ {
+ { AOM_CDF6(30626, 32666, 32740, 32744, 32748), 0 },
+ { AOM_CDF6(30626, 32666, 32740, 32744, 32748), 0 },
+ },
+ {
+ { AOM_CDF6(19326, 30715, 32384, 32644, 32713), 93 },
+ { AOM_CDF6(19326, 30715, 32384, 32644, 32713), 93 },
+ },
+ {
+ { AOM_CDF6(11868, 25066, 29958, 31653, 32254), 115 },
+ { AOM_CDF6(11868, 25066, 29958, 31653, 32254), 115 },
+ },
+ {
+ { AOM_CDF6(8124, 19467, 26069, 29307, 30909), 115 },
+ { AOM_CDF6(8124, 19467, 26069, 29307, 30909), 115 },
+ },
+ {
+ { AOM_CDF6(4754, 12825, 19113, 23576, 26611), 90 },
+ { AOM_CDF6(4754, 12825, 19113, 23576, 26611), 90 },
+ },
+#else
{
{ AOM_CDF6(29406, 32588, 32680, 32730, 32734), 3 },
{ AOM_CDF6(29211, 31901, 32601, 32700, 32727), 0 },
@@ -6678,6 +7498,7 @@
{ AOM_CDF6(5377, 15294, 22474, 26827, 29028), 115 },
{ AOM_CDF6(421, 9759, 18236, 23952, 27679), 90 },
},
+#endif
},
{
{
@@ -6764,6 +7585,56 @@
{ AOM_CDF6(4870, 14063, 21039, 25691, 28445), 75 },
{ AOM_CDF6(65, 9937, 18152, 23756, 27274), 75 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(31190, 32623, 32728, 32736, 32740), 75 },
+ { AOM_CDF6(31190, 32623, 32728, 32736, 32740), 75 },
+ },
+ {
+ { AOM_CDF6(17296, 30538, 32283, 32595, 32679), 115 },
+ { AOM_CDF6(17296, 30538, 32283, 32595, 32679), 115 },
+ },
+ {
+ { AOM_CDF6(9855, 23676, 29421, 31444, 32139), 90 },
+ { AOM_CDF6(9855, 23676, 29421, 31444, 32139), 90 },
+ },
+ {
+ { AOM_CDF6(5610, 15572, 23067, 27145, 29141), 75 },
+ { AOM_CDF6(5610, 15572, 23067, 27145, 29141), 75 },
+ },
+ {
+ { AOM_CDF6(3359, 10455, 17462, 22799, 26242), 75 },
+ { AOM_CDF6(3359, 10455, 17462, 22799, 26242), 75 },
+ },
+ {
+ { AOM_CDF6(2562, 7733, 13030, 18172, 22037), 95 },
+ { AOM_CDF6(2562, 7733, 13030, 18172, 22037), 95 },
+ },
+ {
+ { AOM_CDF6(1533, 4582, 7815, 11120, 14554), 8 },
+ { AOM_CDF6(1533, 4582, 7815, 11120, 14554), 8 },
+ },
+ {
+ { AOM_CDF6(31894, 32738, 32742, 32746, 32750), 0 },
+ { AOM_CDF6(31894, 32738, 32742, 32746, 32750), 0 },
+ },
+ {
+ { AOM_CDF6(20885, 31806, 32640, 32734, 32738), 118 },
+ { AOM_CDF6(20885, 31806, 32640, 32734, 32738), 118 },
+ },
+ {
+ { AOM_CDF6(12973, 27352, 31367, 32350, 32605), 100 },
+ { AOM_CDF6(12973, 27352, 31367, 32350, 32605), 100 },
+ },
+ {
+ { AOM_CDF6(8298, 21287, 28025, 30769, 31890), 91 },
+ { AOM_CDF6(8298, 21287, 28025, 30769, 31890), 91 },
+ },
+ {
+ { AOM_CDF6(4886, 13785, 20958, 25454, 28197), 76 },
+ { AOM_CDF6(4886, 13785, 20958, 25454, 28197), 76 },
+ },
+#else
{
{ AOM_CDF6(30342, 32711, 32740, 32744, 32748), 1 },
{ AOM_CDF6(32530, 32554, 32723, 32736, 32740), 0 },
@@ -6812,6 +7683,7 @@
{ AOM_CDF6(5088, 19909, 27814, 30515, 31513), 26 },
{ AOM_CDF6(2779, 13976, 22563, 27348, 29775), 1 },
},
+#endif
},
{
{
@@ -7168,6 +8040,56 @@
{ AOM_CDF6(4681, 14043, 18725, 23406, 28087), 0 },
{ AOM_CDF6(4681, 9362, 18725, 23406, 28087), 0 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(27523, 31549, 32239, 32557, 32644), 99 },
+ { AOM_CDF6(27523, 31549, 32239, 32557, 32644), 99 },
+ },
+ {
+ { AOM_CDF6(13891, 26332, 30540, 31905, 32545), 15 },
+ { AOM_CDF6(13891, 26332, 30540, 31905, 32545), 15 },
+ },
+ {
+ { AOM_CDF6(9368, 19790, 26821, 30278, 31710), 42 },
+ { AOM_CDF6(9368, 19790, 26821, 30278, 31710), 42 },
+ },
+ {
+ { AOM_CDF6(7770, 17585, 24454, 27851, 29822), 50 },
+ { AOM_CDF6(7770, 17585, 24454, 27851, 29822), 50 },
+ },
+ {
+ { AOM_CDF6(2731, 8548, 14128, 22439, 25882), 0 },
+ { AOM_CDF6(2731, 8548, 14128, 22439, 25882), 0 },
+ },
+ {
+ { AOM_CDF6(520, 7282, 12483, 20285, 23406), 0 },
+ { AOM_CDF6(520, 7282, 12483, 20285, 23406), 0 },
+ },
+ {
+ { AOM_CDF6(1638, 11469, 14746, 16384, 19661), 0 },
+ { AOM_CDF6(1638, 11469, 14746, 16384, 19661), 0 },
+ },
+ {
+ { AOM_CDF6(30430, 32574, 32740, 32744, 32748), 41 },
+ { AOM_CDF6(30430, 32574, 32740, 32744, 32748), 41 },
+ },
+ {
+ { AOM_CDF6(19285, 29197, 32409, 32731, 32735), 19 },
+ { AOM_CDF6(19285, 29197, 32409, 32731, 32735), 19 },
+ },
+ {
+ { AOM_CDF6(13323, 25054, 30001, 31837, 32425), 25 },
+ { AOM_CDF6(13323, 25054, 30001, 31837, 32425), 25 },
+ },
+ {
+ { AOM_CDF6(10464, 17623, 22855, 28913, 31667), 0 },
+ { AOM_CDF6(10464, 17623, 22855, 28913, 31667), 0 },
+ },
+ {
+ { AOM_CDF6(5461, 16384, 21845, 25122, 29491), 0 },
+ { AOM_CDF6(5461, 16384, 21845, 25122, 29491), 0 },
+ },
+#else
{
{ AOM_CDF6(30065, 32622, 32658, 32695, 32731), 35 },
{ AOM_CDF6(31535, 31634, 32447, 32620, 32719), 86 },
@@ -7216,6 +8138,7 @@
{ AOM_CDF6(5461, 10923, 16384, 21845, 27307), 0 },
{ AOM_CDF6(5461, 10923, 16384, 21845, 27307), 0 },
},
+#endif
},
{
{
@@ -7302,6 +8225,56 @@
{ AOM_CDF6(8508, 22676, 29590, 31571, 32464), 75 },
{ AOM_CDF6(1358, 16850, 27388, 31584, 32502), 1 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(30812, 32458, 32672, 32720, 32732), 0 },
+ { AOM_CDF6(30812, 32458, 32672, 32720, 32732), 0 },
+ },
+ {
+ { AOM_CDF6(14805, 28597, 31834, 32457, 32643), 75 },
+ { AOM_CDF6(14805, 28597, 31834, 32457, 32643), 75 },
+ },
+ {
+ { AOM_CDF6(7885, 19026, 25996, 30110, 31734), 15 },
+ { AOM_CDF6(7885, 19026, 25996, 30110, 31734), 15 },
+ },
+ {
+ { AOM_CDF6(5016, 13942, 20823, 26044, 29114), 8 },
+ { AOM_CDF6(5016, 13942, 20823, 26044, 29114), 8 },
+ },
+ {
+ { AOM_CDF6(1976, 6346, 13934, 19218, 24119), 85 },
+ { AOM_CDF6(1976, 6346, 13934, 19218, 24119), 85 },
+ },
+ {
+ { AOM_CDF6(1964, 4548, 10578, 14265, 18951), 0 },
+ { AOM_CDF6(1964, 4548, 10578, 14265, 18951), 0 },
+ },
+ {
+ { AOM_CDF6(1365, 4642, 7646, 12379, 15110), 0 },
+ { AOM_CDF6(1365, 4642, 7646, 12379, 15110), 0 },
+ },
+ {
+ { AOM_CDF6(31956, 32712, 32740, 32744, 32748), 3 },
+ { AOM_CDF6(31956, 32712, 32740, 32744, 32748), 3 },
+ },
+ {
+ { AOM_CDF6(21806, 31381, 32627, 32722, 32732), 75 },
+ { AOM_CDF6(21806, 31381, 32627, 32722, 32732), 75 },
+ },
+ {
+ { AOM_CDF6(15258, 27788, 31399, 32476, 32692), 80 },
+ { AOM_CDF6(15258, 27788, 31399, 32476, 32692), 80 },
+ },
+ {
+ { AOM_CDF6(10991, 24246, 29922, 31791, 32374), 14 },
+ { AOM_CDF6(10991, 24246, 29922, 31791, 32374), 14 },
+ },
+ {
+ { AOM_CDF6(7128, 19357, 26823, 30289, 31838), 0 },
+ { AOM_CDF6(7128, 19357, 26823, 30289, 31838), 0 },
+ },
+#else
{
{ AOM_CDF6(31611, 32737, 32741, 32745, 32749), 3 },
{ AOM_CDF6(32251, 32256, 32675, 32736, 32740), 95 },
@@ -7350,6 +8323,7 @@
{ AOM_CDF6(5958, 14895, 22342, 28300, 29789), 50 },
{ AOM_CDF6(3277, 14199, 26214, 28399, 29491), 100 },
},
+#endif
},
{
{
@@ -7436,6 +8410,56 @@
{ AOM_CDF6(6820, 19262, 26836, 30391, 31927), 90 },
{ AOM_CDF6(633, 13427, 23701, 28986, 31432), 75 },
},
+#if TCQ_DIS_1D
+ {
+ { AOM_CDF6(31727, 32641, 32740, 32744, 32748), 75 },
+ { AOM_CDF6(31727, 32641, 32740, 32744, 32748), 75 },
+ },
+ {
+ { AOM_CDF6(15406, 30201, 32359, 32684, 32732), 90 },
+ { AOM_CDF6(15406, 30201, 32359, 32684, 32732), 90 },
+ },
+ {
+ { AOM_CDF6(7790, 20673, 28093, 31356, 32248), 6 },
+ { AOM_CDF6(7790, 20673, 28093, 31356, 32248), 6 },
+ },
+ {
+ { AOM_CDF6(4934, 13061, 20093, 24456, 26939), 0 },
+ { AOM_CDF6(4934, 13061, 20093, 24456, 26939), 0 },
+ },
+ {
+ { AOM_CDF6(1586, 7752, 14710, 20348, 24664), 0 },
+ { AOM_CDF6(1586, 7752, 14710, 20348, 24664), 0 },
+ },
+ {
+ { AOM_CDF6(2556, 5578, 8366, 16268, 20219), 0 },
+ { AOM_CDF6(2556, 5578, 8366, 16268, 20219), 0 },
+ },
+ {
+ { AOM_CDF6(2521, 5041, 8822, 13233, 14494), 0 },
+ { AOM_CDF6(2521, 5041, 8822, 13233, 14494), 0 },
+ },
+ {
+ { AOM_CDF6(32430, 32744, 32748, 32752, 32756), 0 },
+ { AOM_CDF6(32430, 32744, 32748, 32752, 32756), 0 },
+ },
+ {
+ { AOM_CDF6(21293, 32055, 32715, 32736, 32740), 115 },
+ { AOM_CDF6(21293, 32055, 32715, 32736, 32740), 115 },
+ },
+ {
+ { AOM_CDF6(13103, 28431, 31813, 32514, 32666), 77 },
+ { AOM_CDF6(13103, 28431, 31813, 32514, 32666), 77 },
+ },
+ {
+ { AOM_CDF6(11926, 24738, 30229, 31941, 32473), 100 },
+ { AOM_CDF6(11926, 24738, 30229, 31941, 32473), 100 },
+ },
+ {
+ { AOM_CDF6(8797, 18693, 24411, 29249, 31229), 0 },
+ { AOM_CDF6(8797, 18693, 24411, 29249, 31229), 0 },
+ },
+#else
{
{ AOM_CDF6(31832, 32744, 32748, 32752, 32756), 1 },
{ AOM_CDF6(32493, 32497, 32732, 32736, 32740), 23 },
@@ -7484,6 +8508,7 @@
{ AOM_CDF6(3641, 21845, 26700, 29127, 31554), 50 },
{ AOM_CDF6(2185, 13107, 25122, 29491, 31676), 100 },
},
+#endif
},
{
{
