Optimizations for filter_intra
Reduce number of modes from 10 to 6, and disable fi modes in UV.
To reduce complexity, apply filter directly without subtracting
the estimated means.
Change-Id: Iaf78d92d31e4a7cc30ea7863b57a9611c5f503e6
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 59b9514..c93f2af 100755
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -185,24 +185,16 @@
add_proto qw/void av1_dc_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
add_proto qw/void av1_v_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
add_proto qw/void av1_h_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
- add_proto qw/void av1_d45_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
- add_proto qw/void av1_d135_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
add_proto qw/void av1_d117_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
add_proto qw/void av1_d153_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
- add_proto qw/void av1_d207_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
- add_proto qw/void av1_d63_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
add_proto qw/void av1_paeth_filter_predictor/, "uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left";
# High bitdepth functions
if (aom_config("CONFIG_HIGHBITDEPTH") eq "yes") {
add_proto qw/void av1_highbd_dc_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
add_proto qw/void av1_highbd_v_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
add_proto qw/void av1_highbd_h_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
- add_proto qw/void av1_highbd_d45_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
- add_proto qw/void av1_highbd_d135_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
add_proto qw/void av1_highbd_d117_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
add_proto qw/void av1_highbd_d153_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
- add_proto qw/void av1_highbd_d207_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
- add_proto qw/void av1_highbd_d63_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
add_proto qw/void av1_highbd_paeth_filter_predictor/, "uint16_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint16_t *above, const uint16_t *left, int bd";
}
}
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 36ce7c3..5ad7894 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -261,6 +261,10 @@
uint8_t use_filter_intra_mode[PLANE_TYPES];
FILTER_INTRA_MODE filter_intra_mode[PLANE_TYPES];
} FILTER_INTRA_MODE_INFO;
+
+static const PREDICTION_MODE fimode_to_intradir[FILTER_INTRA_MODES] = {
+ DC_PRED, V_PRED, H_PRED, D117_PRED, D153_PRED, DC_PRED
+};
#endif // CONFIG_FILTER_INTRA
#if CONFIG_RD_DEBUG
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index c324cbb..d278cf8 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2521,15 +2521,13 @@
#endif // CONFIG_LGT_FROM_PRED
#if CONFIG_FILTER_INTRA
-static const aom_prob default_filter_intra_probs[2] = { 97, 236 };
+static const aom_prob default_filter_intra_probs[2] = { 103, 231 };
static const aom_cdf_prob
default_filter_intra_mode_cdf[2][CDF_SIZE(FILTER_INTRA_MODES)] = {
- { AOM_ICDF(24233), AOM_ICDF(27560), AOM_ICDF(30172), AOM_ICDF(30176),
- AOM_ICDF(30289), AOM_ICDF(30836), AOM_ICDF(31669), AOM_ICDF(31694),
- AOM_ICDF(31707), AOM_ICDF(32768), 0 },
- { AOM_ICDF(31855), AOM_ICDF(31994), AOM_ICDF(32136), AOM_ICDF(32152),
- AOM_ICDF(32225), AOM_ICDF(32409), AOM_ICDF(32642), AOM_ICDF(32685),
+ { AOM_ICDF(24348), AOM_ICDF(27690), AOM_ICDF(30315), AOM_ICDF(30864),
+ AOM_ICDF(31701), AOM_ICDF(32768), 0 },
+ { AOM_ICDF(31977), AOM_ICDF(32117), AOM_ICDF(32300), AOM_ICDF(32484),
AOM_ICDF(32719), AOM_ICDF(32768), 0 }
};
#endif // CONFIG_FILTER_INTRA
@@ -2719,6 +2717,63 @@
AOM_ICDF(28612), AOM_ICDF(32768), 0 },
};
#else
+#if CONFIG_FILTER_INTRA
+static const aom_cdf_prob
+ default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = {
+ { AOM_ICDF(17902), AOM_ICDF(18828), AOM_ICDF(21117), AOM_ICDF(21487),
+ AOM_ICDF(21924), AOM_ICDF(22484), AOM_ICDF(23588), AOM_ICDF(24669),
+ AOM_ICDF(25177), AOM_ICDF(28731), AOM_ICDF(29903), AOM_ICDF(31509),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(9654), AOM_ICDF(23559), AOM_ICDF(23873), AOM_ICDF(24050),
+ AOM_ICDF(24203), AOM_ICDF(24929), AOM_ICDF(25057), AOM_ICDF(25286),
+ AOM_ICDF(26027), AOM_ICDF(28172), AOM_ICDF(28716), AOM_ICDF(30913),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(10012), AOM_ICDF(10124), AOM_ICDF(25394), AOM_ICDF(25540),
+ AOM_ICDF(25665), AOM_ICDF(25752), AOM_ICDF(26567), AOM_ICDF(27761),
+ AOM_ICDF(27876), AOM_ICDF(29497), AOM_ICDF(30581), AOM_ICDF(31179),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(15143), AOM_ICDF(15859), AOM_ICDF(16581), AOM_ICDF(21567),
+ AOM_ICDF(21968), AOM_ICDF(22430), AOM_ICDF(22867), AOM_ICDF(24953),
+ AOM_ICDF(26969), AOM_ICDF(30310), AOM_ICDF(31125), AOM_ICDF(32329),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(14063), AOM_ICDF(14416), AOM_ICDF(14921), AOM_ICDF(15022),
+ AOM_ICDF(25164), AOM_ICDF(26720), AOM_ICDF(28661), AOM_ICDF(29083),
+ AOM_ICDF(29277), AOM_ICDF(31337), AOM_ICDF(31882), AOM_ICDF(32565),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(12942), AOM_ICDF(14713), AOM_ICDF(15178), AOM_ICDF(15325),
+ AOM_ICDF(16964), AOM_ICDF(27421), AOM_ICDF(27834), AOM_ICDF(28306),
+ AOM_ICDF(28645), AOM_ICDF(30804), AOM_ICDF(31322), AOM_ICDF(32387),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(13687), AOM_ICDF(13993), AOM_ICDF(16776), AOM_ICDF(16912),
+ AOM_ICDF(18338), AOM_ICDF(18648), AOM_ICDF(27557), AOM_ICDF(28140),
+ AOM_ICDF(28359), AOM_ICDF(30820), AOM_ICDF(31669), AOM_ICDF(32443),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(14180), AOM_ICDF(14439), AOM_ICDF(16582), AOM_ICDF(17373),
+ AOM_ICDF(17675), AOM_ICDF(17931), AOM_ICDF(18453), AOM_ICDF(26308),
+ AOM_ICDF(26761), AOM_ICDF(30058), AOM_ICDF(31293), AOM_ICDF(32156),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(12480), AOM_ICDF(14300), AOM_ICDF(14838), AOM_ICDF(16085),
+ AOM_ICDF(16434), AOM_ICDF(17023), AOM_ICDF(17426), AOM_ICDF(18313),
+ AOM_ICDF(26041), AOM_ICDF(29653), AOM_ICDF(30347), AOM_ICDF(32067),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(17202), AOM_ICDF(18093), AOM_ICDF(19414), AOM_ICDF(19910),
+ AOM_ICDF(20311), AOM_ICDF(20837), AOM_ICDF(21554), AOM_ICDF(22830),
+ AOM_ICDF(23572), AOM_ICDF(28770), AOM_ICDF(30259), AOM_ICDF(32145),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(16336), AOM_ICDF(18149), AOM_ICDF(19485), AOM_ICDF(19927),
+ AOM_ICDF(20365), AOM_ICDF(20924), AOM_ICDF(21524), AOM_ICDF(22561),
+ AOM_ICDF(23421), AOM_ICDF(28141), AOM_ICDF(30701), AOM_ICDF(32020),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(16485), AOM_ICDF(17366), AOM_ICDF(19874), AOM_ICDF(20364),
+ AOM_ICDF(20713), AOM_ICDF(21057), AOM_ICDF(21773), AOM_ICDF(23100),
+ AOM_ICDF(23685), AOM_ICDF(28079), AOM_ICDF(29091), AOM_ICDF(32028),
+ AOM_ICDF(32768), 0 },
+ { AOM_ICDF(13638), AOM_ICDF(16789), AOM_ICDF(19763), AOM_ICDF(19903),
+ AOM_ICDF(19995), AOM_ICDF(20201), AOM_ICDF(20405), AOM_ICDF(20861),
+ AOM_ICDF(21174), AOM_ICDF(22802), AOM_ICDF(23566), AOM_ICDF(24754),
+ AOM_ICDF(32768), 0 }
+ };
+#else
static const aom_cdf_prob
default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = {
{
@@ -2800,6 +2855,7 @@
AOM_ICDF(32768), 0,
},
};
+#endif
#endif // CONFIG_CFL
#else // !CONFIG_SMOOTH_HV
static const aom_cdf_prob
@@ -3729,681 +3785,681 @@
default_kf_y_mode_cdf[INTRA_MODES][INTRA_MODES][CDF_SIZE(INTRA_MODES)] = {
#if CONFIG_SMOOTH_HV
#if CONFIG_FILTER_INTRA
- { { AOM_ICDF(13847), AOM_ICDF(15972), AOM_ICDF(18546), AOM_ICDF(19109),
- AOM_ICDF(19808), AOM_ICDF(20664), AOM_ICDF(21816), AOM_ICDF(23335),
- AOM_ICDF(24334), AOM_ICDF(28821), AOM_ICDF(30135), AOM_ICDF(32025),
+ { { AOM_ICDF(14683), AOM_ICDF(16164), AOM_ICDF(18655), AOM_ICDF(19530),
+ AOM_ICDF(20058), AOM_ICDF(20712), AOM_ICDF(21844), AOM_ICDF(23569),
+ AOM_ICDF(24762), AOM_ICDF(29323), AOM_ICDF(30502), AOM_ICDF(32305),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(12415), AOM_ICDF(20556), AOM_ICDF(21554), AOM_ICDF(21963),
- AOM_ICDF(22447), AOM_ICDF(23321), AOM_ICDF(23798), AOM_ICDF(24563),
- AOM_ICDF(25817), AOM_ICDF(28953), AOM_ICDF(30478), AOM_ICDF(31463),
+ { AOM_ICDF(12656), AOM_ICDF(20348), AOM_ICDF(21294), AOM_ICDF(21804),
+ AOM_ICDF(22202), AOM_ICDF(23095), AOM_ICDF(23587), AOM_ICDF(24461),
+ AOM_ICDF(25907), AOM_ICDF(29190), AOM_ICDF(30652), AOM_ICDF(31811),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8835), AOM_ICDF(9521), AOM_ICDF(22111), AOM_ICDF(22419),
- AOM_ICDF(22703), AOM_ICDF(22968), AOM_ICDF(24169), AOM_ICDF(25657),
- AOM_ICDF(26003), AOM_ICDF(28886), AOM_ICDF(29526), AOM_ICDF(31619),
+ { AOM_ICDF(9503), AOM_ICDF(9951), AOM_ICDF(23007), AOM_ICDF(23314),
+ AOM_ICDF(23541), AOM_ICDF(23705), AOM_ICDF(24951), AOM_ICDF(26524),
+ AOM_ICDF(26849), AOM_ICDF(29605), AOM_ICDF(30141), AOM_ICDF(31999),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11916), AOM_ICDF(12931), AOM_ICDF(14245), AOM_ICDF(16835),
- AOM_ICDF(17362), AOM_ICDF(17938), AOM_ICDF(18692), AOM_ICDF(22128),
- AOM_ICDF(24050), AOM_ICDF(29077), AOM_ICDF(30399), AOM_ICDF(32369),
+ { AOM_ICDF(13260), AOM_ICDF(14061), AOM_ICDF(15139), AOM_ICDF(17906),
+ AOM_ICDF(18255), AOM_ICDF(18765), AOM_ICDF(19485), AOM_ICDF(22590),
+ AOM_ICDF(24686), AOM_ICDF(29535), AOM_ICDF(30788), AOM_ICDF(32556),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7949), AOM_ICDF(9050), AOM_ICDF(9820), AOM_ICDF(10365),
- AOM_ICDF(20390), AOM_ICDF(23302), AOM_ICDF(25481), AOM_ICDF(26635),
- AOM_ICDF(27458), AOM_ICDF(30582), AOM_ICDF(31465), AOM_ICDF(32573),
+ { AOM_ICDF(9636), AOM_ICDF(10707), AOM_ICDF(11584), AOM_ICDF(12180),
+ AOM_ICDF(19805), AOM_ICDF(22417), AOM_ICDF(24821), AOM_ICDF(25934),
+ AOM_ICDF(26829), AOM_ICDF(30447), AOM_ICDF(31325), AOM_ICDF(32571),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10797), AOM_ICDF(13630), AOM_ICDF(14512), AOM_ICDF(15199),
- AOM_ICDF(17119), AOM_ICDF(23702), AOM_ICDF(24832), AOM_ICDF(25891),
- AOM_ICDF(27272), AOM_ICDF(30334), AOM_ICDF(31413), AOM_ICDF(32386),
+ { AOM_ICDF(11503), AOM_ICDF(14182), AOM_ICDF(15005), AOM_ICDF(15716),
+ AOM_ICDF(17312), AOM_ICDF(22822), AOM_ICDF(23813), AOM_ICDF(24939),
+ AOM_ICDF(26485), AOM_ICDF(30176), AOM_ICDF(31386), AOM_ICDF(32491),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9511), AOM_ICDF(10410), AOM_ICDF(13059), AOM_ICDF(13514),
- AOM_ICDF(15945), AOM_ICDF(16745), AOM_ICDF(23359), AOM_ICDF(24704),
- AOM_ICDF(25410), AOM_ICDF(29450), AOM_ICDF(30392), AOM_ICDF(32436),
+ { AOM_ICDF(10780), AOM_ICDF(11415), AOM_ICDF(14363), AOM_ICDF(14834),
+ AOM_ICDF(16619), AOM_ICDF(17205), AOM_ICDF(23514), AOM_ICDF(24954),
+ AOM_ICDF(25580), AOM_ICDF(29808), AOM_ICDF(30651), AOM_ICDF(32535),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9767), AOM_ICDF(10753), AOM_ICDF(13594), AOM_ICDF(14628),
- AOM_ICDF(15295), AOM_ICDF(15979), AOM_ICDF(17298), AOM_ICDF(22805),
- AOM_ICDF(23847), AOM_ICDF(28686), AOM_ICDF(29937), AOM_ICDF(32378),
+ { AOM_ICDF(10987), AOM_ICDF(11732), AOM_ICDF(14421), AOM_ICDF(15496),
+ AOM_ICDF(15957), AOM_ICDF(16409), AOM_ICDF(17580), AOM_ICDF(23241),
+ AOM_ICDF(24331), AOM_ICDF(29195), AOM_ICDF(30353), AOM_ICDF(32508),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11365), AOM_ICDF(13477), AOM_ICDF(14600), AOM_ICDF(15838),
- AOM_ICDF(16437), AOM_ICDF(17513), AOM_ICDF(18524), AOM_ICDF(20393),
- AOM_ICDF(23829), AOM_ICDF(28791), AOM_ICDF(30682), AOM_ICDF(32267),
+ { AOM_ICDF(12508), AOM_ICDF(14242), AOM_ICDF(15162), AOM_ICDF(16631),
+ AOM_ICDF(17071), AOM_ICDF(17984), AOM_ICDF(18776), AOM_ICDF(20784),
+ AOM_ICDF(24151), AOM_ICDF(29108), AOM_ICDF(30867), AOM_ICDF(32444),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11736), AOM_ICDF(13422), AOM_ICDF(15514), AOM_ICDF(16257),
- AOM_ICDF(16912), AOM_ICDF(17817), AOM_ICDF(19074), AOM_ICDF(21071),
- AOM_ICDF(22282), AOM_ICDF(28094), AOM_ICDF(29857), AOM_ICDF(32271),
+ { AOM_ICDF(12829), AOM_ICDF(14161), AOM_ICDF(16064), AOM_ICDF(16898),
+ AOM_ICDF(17478), AOM_ICDF(18230), AOM_ICDF(19432), AOM_ICDF(21587),
+ AOM_ICDF(22866), AOM_ICDF(28544), AOM_ICDF(30194), AOM_ICDF(32428),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11485), AOM_ICDF(13903), AOM_ICDF(16087), AOM_ICDF(16806),
- AOM_ICDF(17573), AOM_ICDF(18721), AOM_ICDF(19690), AOM_ICDF(21425),
- AOM_ICDF(22653), AOM_ICDF(27868), AOM_ICDF(30101), AOM_ICDF(31977),
+ { AOM_ICDF(12573), AOM_ICDF(14467), AOM_ICDF(16431), AOM_ICDF(17241),
+ AOM_ICDF(17858), AOM_ICDF(18791), AOM_ICDF(19760), AOM_ICDF(21697),
+ AOM_ICDF(22982), AOM_ICDF(28322), AOM_ICDF(30394), AOM_ICDF(32214),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11573), AOM_ICDF(13098), AOM_ICDF(16106), AOM_ICDF(16832),
- AOM_ICDF(17404), AOM_ICDF(18051), AOM_ICDF(19450), AOM_ICDF(21562),
- AOM_ICDF(22535), AOM_ICDF(28140), AOM_ICDF(29546), AOM_ICDF(32254),
+ { AOM_ICDF(12584), AOM_ICDF(13813), AOM_ICDF(16632), AOM_ICDF(17412),
+ AOM_ICDF(17891), AOM_ICDF(18453), AOM_ICDF(19775), AOM_ICDF(21906),
+ AOM_ICDF(22973), AOM_ICDF(28492), AOM_ICDF(29852), AOM_ICDF(32414),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9634), AOM_ICDF(12395), AOM_ICDF(16506), AOM_ICDF(16893),
- AOM_ICDF(17172), AOM_ICDF(17618), AOM_ICDF(18148), AOM_ICDF(19132),
- AOM_ICDF(19880), AOM_ICDF(22687), AOM_ICDF(23818), AOM_ICDF(25226),
+ { AOM_ICDF(10371), AOM_ICDF(13033), AOM_ICDF(17420), AOM_ICDF(17894),
+ AOM_ICDF(18176), AOM_ICDF(18567), AOM_ICDF(19210), AOM_ICDF(20319),
+ AOM_ICDF(21090), AOM_ICDF(24048), AOM_ICDF(25125), AOM_ICDF(26632),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(8433), AOM_ICDF(21581), AOM_ICDF(22320), AOM_ICDF(22635),
- AOM_ICDF(22989), AOM_ICDF(24266), AOM_ICDF(24546), AOM_ICDF(25057),
- AOM_ICDF(26310), AOM_ICDF(28780), AOM_ICDF(30438), AOM_ICDF(31106),
+ { { AOM_ICDF(9051), AOM_ICDF(21642), AOM_ICDF(22328), AOM_ICDF(22666),
+ AOM_ICDF(22990), AOM_ICDF(24191), AOM_ICDF(24466), AOM_ICDF(25094),
+ AOM_ICDF(26458), AOM_ICDF(29094), AOM_ICDF(30542), AOM_ICDF(31304),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5960), AOM_ICDF(26121), AOM_ICDF(26318), AOM_ICDF(26506),
- AOM_ICDF(26653), AOM_ICDF(27344), AOM_ICDF(27443), AOM_ICDF(27686),
- AOM_ICDF(28769), AOM_ICDF(30042), AOM_ICDF(31317), AOM_ICDF(31600),
+ { AOM_ICDF(5783), AOM_ICDF(26271), AOM_ICDF(26458), AOM_ICDF(26655),
+ AOM_ICDF(26792), AOM_ICDF(27507), AOM_ICDF(27595), AOM_ICDF(27910),
+ AOM_ICDF(29012), AOM_ICDF(30270), AOM_ICDF(31322), AOM_ICDF(31740),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8277), AOM_ICDF(14450), AOM_ICDF(19976), AOM_ICDF(20311),
- AOM_ICDF(20576), AOM_ICDF(21162), AOM_ICDF(21565), AOM_ICDF(22763),
- AOM_ICDF(23921), AOM_ICDF(26376), AOM_ICDF(27633), AOM_ICDF(29050),
+ { AOM_ICDF(9084), AOM_ICDF(14570), AOM_ICDF(20536), AOM_ICDF(20922),
+ AOM_ICDF(21174), AOM_ICDF(21685), AOM_ICDF(22190), AOM_ICDF(23274),
+ AOM_ICDF(24293), AOM_ICDF(26854), AOM_ICDF(27998), AOM_ICDF(29451),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8805), AOM_ICDF(15382), AOM_ICDF(15991), AOM_ICDF(18188),
- AOM_ICDF(18798), AOM_ICDF(19889), AOM_ICDF(20113), AOM_ICDF(22150),
- AOM_ICDF(24957), AOM_ICDF(28470), AOM_ICDF(31036), AOM_ICDF(32078),
+ { AOM_ICDF(9162), AOM_ICDF(15547), AOM_ICDF(16132), AOM_ICDF(18428),
+ AOM_ICDF(19036), AOM_ICDF(19961), AOM_ICDF(20253), AOM_ICDF(22111),
+ AOM_ICDF(25468), AOM_ICDF(28977), AOM_ICDF(31151), AOM_ICDF(32108),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5517), AOM_ICDF(14751), AOM_ICDF(15406), AOM_ICDF(15744),
- AOM_ICDF(19598), AOM_ICDF(23361), AOM_ICDF(24234), AOM_ICDF(24896),
- AOM_ICDF(26521), AOM_ICDF(29321), AOM_ICDF(31127), AOM_ICDF(31722),
+ { AOM_ICDF(6626), AOM_ICDF(15650), AOM_ICDF(16281), AOM_ICDF(16696),
+ AOM_ICDF(20419), AOM_ICDF(23826), AOM_ICDF(24669), AOM_ICDF(25188),
+ AOM_ICDF(26709), AOM_ICDF(29561), AOM_ICDF(31203), AOM_ICDF(31811),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5942), AOM_ICDF(16917), AOM_ICDF(17286), AOM_ICDF(17588),
- AOM_ICDF(18427), AOM_ICDF(25297), AOM_ICDF(25614), AOM_ICDF(26032),
- AOM_ICDF(28186), AOM_ICDF(30315), AOM_ICDF(31583), AOM_ICDF(32037),
+ { AOM_ICDF(5946), AOM_ICDF(17790), AOM_ICDF(18063), AOM_ICDF(18339),
+ AOM_ICDF(19049), AOM_ICDF(25701), AOM_ICDF(25942), AOM_ICDF(26289),
+ AOM_ICDF(28224), AOM_ICDF(30501), AOM_ICDF(31732), AOM_ICDF(32192),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6819), AOM_ICDF(14647), AOM_ICDF(15603), AOM_ICDF(15982),
- AOM_ICDF(17567), AOM_ICDF(19001), AOM_ICDF(22422), AOM_ICDF(23415),
- AOM_ICDF(24834), AOM_ICDF(28422), AOM_ICDF(30159), AOM_ICDF(31205),
+ { AOM_ICDF(8247), AOM_ICDF(15710), AOM_ICDF(16700), AOM_ICDF(17083),
+ AOM_ICDF(18600), AOM_ICDF(19891), AOM_ICDF(23303), AOM_ICDF(24149),
+ AOM_ICDF(25418), AOM_ICDF(28745), AOM_ICDF(30205), AOM_ICDF(31229),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6876), AOM_ICDF(14374), AOM_ICDF(15920), AOM_ICDF(16878),
- AOM_ICDF(17405), AOM_ICDF(18474), AOM_ICDF(18986), AOM_ICDF(22986),
- AOM_ICDF(24673), AOM_ICDF(28341), AOM_ICDF(30545), AOM_ICDF(31744),
+ { AOM_ICDF(7414), AOM_ICDF(14790), AOM_ICDF(16103), AOM_ICDF(17056),
+ AOM_ICDF(17437), AOM_ICDF(18332), AOM_ICDF(18797), AOM_ICDF(23279),
+ AOM_ICDF(25024), AOM_ICDF(28630), AOM_ICDF(30385), AOM_ICDF(31627),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7509), AOM_ICDF(17077), AOM_ICDF(17335), AOM_ICDF(18078),
- AOM_ICDF(18515), AOM_ICDF(19715), AOM_ICDF(19991), AOM_ICDF(20593),
- AOM_ICDF(26312), AOM_ICDF(29152), AOM_ICDF(31408), AOM_ICDF(31969),
+ { AOM_ICDF(7886), AOM_ICDF(17142), AOM_ICDF(17377), AOM_ICDF(18228),
+ AOM_ICDF(18517), AOM_ICDF(19566), AOM_ICDF(19789), AOM_ICDF(20477),
+ AOM_ICDF(26467), AOM_ICDF(29451), AOM_ICDF(31424), AOM_ICDF(32074),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7715), AOM_ICDF(18618), AOM_ICDF(19259), AOM_ICDF(19691),
- AOM_ICDF(20136), AOM_ICDF(21558), AOM_ICDF(21950), AOM_ICDF(22663),
- AOM_ICDF(24594), AOM_ICDF(28318), AOM_ICDF(30386), AOM_ICDF(31413),
+ { AOM_ICDF(8251), AOM_ICDF(19430), AOM_ICDF(19998), AOM_ICDF(20426),
+ AOM_ICDF(20782), AOM_ICDF(22155), AOM_ICDF(22488), AOM_ICDF(23281),
+ AOM_ICDF(25037), AOM_ICDF(28791), AOM_ICDF(30593), AOM_ICDF(31614),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7377), AOM_ICDF(18875), AOM_ICDF(19595), AOM_ICDF(19876),
- AOM_ICDF(20190), AOM_ICDF(21600), AOM_ICDF(21924), AOM_ICDF(22673),
- AOM_ICDF(24397), AOM_ICDF(27691), AOM_ICDF(30318), AOM_ICDF(31041),
+ { AOM_ICDF(8042), AOM_ICDF(19117), AOM_ICDF(19777), AOM_ICDF(20139),
+ AOM_ICDF(20462), AOM_ICDF(21878), AOM_ICDF(22212), AOM_ICDF(23083),
+ AOM_ICDF(24811), AOM_ICDF(28090), AOM_ICDF(30592), AOM_ICDF(31308),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7823), AOM_ICDF(18633), AOM_ICDF(19633), AOM_ICDF(20086),
- AOM_ICDF(20410), AOM_ICDF(21386), AOM_ICDF(21868), AOM_ICDF(22806),
- AOM_ICDF(24588), AOM_ICDF(28514), AOM_ICDF(30329), AOM_ICDF(31486),
+ { AOM_ICDF(8268), AOM_ICDF(19518), AOM_ICDF(20406), AOM_ICDF(20756),
+ AOM_ICDF(21064), AOM_ICDF(22108), AOM_ICDF(22552), AOM_ICDF(23405),
+ AOM_ICDF(25111), AOM_ICDF(28731), AOM_ICDF(30343), AOM_ICDF(31534),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6184), AOM_ICDF(21189), AOM_ICDF(22280), AOM_ICDF(22485),
- AOM_ICDF(22578), AOM_ICDF(23036), AOM_ICDF(23190), AOM_ICDF(23608),
- AOM_ICDF(24724), AOM_ICDF(26401), AOM_ICDF(28060), AOM_ICDF(28550),
+ { AOM_ICDF(6521), AOM_ICDF(21472), AOM_ICDF(22603), AOM_ICDF(22915),
+ AOM_ICDF(23041), AOM_ICDF(23480), AOM_ICDF(23618), AOM_ICDF(24110),
+ AOM_ICDF(25099), AOM_ICDF(26516), AOM_ICDF(27883), AOM_ICDF(28449),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(12334), AOM_ICDF(13042), AOM_ICDF(21154), AOM_ICDF(21500),
- AOM_ICDF(21825), AOM_ICDF(22176), AOM_ICDF(23372), AOM_ICDF(24918),
- AOM_ICDF(25479), AOM_ICDF(28904), AOM_ICDF(29798), AOM_ICDF(31932),
+ { { AOM_ICDF(12527), AOM_ICDF(13076), AOM_ICDF(21835), AOM_ICDF(22214),
+ AOM_ICDF(22492), AOM_ICDF(22728), AOM_ICDF(23978), AOM_ICDF(25665),
+ AOM_ICDF(26165), AOM_ICDF(29466), AOM_ICDF(30247), AOM_ICDF(32239),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11812), AOM_ICDF(16293), AOM_ICDF(20499), AOM_ICDF(21028),
- AOM_ICDF(21440), AOM_ICDF(21975), AOM_ICDF(22582), AOM_ICDF(23896),
- AOM_ICDF(24951), AOM_ICDF(28157), AOM_ICDF(29422), AOM_ICDF(30879),
+ { AOM_ICDF(12377), AOM_ICDF(16820), AOM_ICDF(21011), AOM_ICDF(21631),
+ AOM_ICDF(21960), AOM_ICDF(22438), AOM_ICDF(23031), AOM_ICDF(24350),
+ AOM_ICDF(25400), AOM_ICDF(28539), AOM_ICDF(29714), AOM_ICDF(31154),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6458), AOM_ICDF(6674), AOM_ICDF(26152), AOM_ICDF(26282),
- AOM_ICDF(26398), AOM_ICDF(26467), AOM_ICDF(27181), AOM_ICDF(28324),
- AOM_ICDF(28461), AOM_ICDF(30178), AOM_ICDF(30478), AOM_ICDF(32092),
+ { AOM_ICDF(6712), AOM_ICDF(6862), AOM_ICDF(26853), AOM_ICDF(26972),
+ AOM_ICDF(27060), AOM_ICDF(27103), AOM_ICDF(27826), AOM_ICDF(29143),
+ AOM_ICDF(29267), AOM_ICDF(30799), AOM_ICDF(31064), AOM_ICDF(32294),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11220), AOM_ICDF(11777), AOM_ICDF(14859), AOM_ICDF(16906),
- AOM_ICDF(17271), AOM_ICDF(17676), AOM_ICDF(18720), AOM_ICDF(23281),
- AOM_ICDF(24437), AOM_ICDF(28430), AOM_ICDF(29667), AOM_ICDF(32180),
+ { AOM_ICDF(11320), AOM_ICDF(11776), AOM_ICDF(15386), AOM_ICDF(17447),
+ AOM_ICDF(17768), AOM_ICDF(18066), AOM_ICDF(18973), AOM_ICDF(23664),
+ AOM_ICDF(25022), AOM_ICDF(29029), AOM_ICDF(30158), AOM_ICDF(32267),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9783), AOM_ICDF(11300), AOM_ICDF(14242), AOM_ICDF(14950),
- AOM_ICDF(19850), AOM_ICDF(21478), AOM_ICDF(24365), AOM_ICDF(25780),
- AOM_ICDF(26525), AOM_ICDF(29716), AOM_ICDF(30690), AOM_ICDF(32419),
+ { AOM_ICDF(10773), AOM_ICDF(11905), AOM_ICDF(15020), AOM_ICDF(15656),
+ AOM_ICDF(20247), AOM_ICDF(21640), AOM_ICDF(24465), AOM_ICDF(25777),
+ AOM_ICDF(26419), AOM_ICDF(29685), AOM_ICDF(30762), AOM_ICDF(32481),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(12386), AOM_ICDF(14398), AOM_ICDF(17560), AOM_ICDF(18309),
- AOM_ICDF(19703), AOM_ICDF(22803), AOM_ICDF(23927), AOM_ICDF(25512),
- AOM_ICDF(26845), AOM_ICDF(29780), AOM_ICDF(30860), AOM_ICDF(32211),
+ { AOM_ICDF(12323), AOM_ICDF(14046), AOM_ICDF(17449), AOM_ICDF(18101),
+ AOM_ICDF(19214), AOM_ICDF(22210), AOM_ICDF(23345), AOM_ICDF(24975),
+ AOM_ICDF(26412), AOM_ICDF(29729), AOM_ICDF(30931), AOM_ICDF(32336),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9283), AOM_ICDF(9623), AOM_ICDF(15899), AOM_ICDF(16229),
- AOM_ICDF(17289), AOM_ICDF(17619), AOM_ICDF(24455), AOM_ICDF(26166),
- AOM_ICDF(26499), AOM_ICDF(29634), AOM_ICDF(30207), AOM_ICDF(32435),
+ { AOM_ICDF(9944), AOM_ICDF(10198), AOM_ICDF(17726), AOM_ICDF(18052),
+ AOM_ICDF(18893), AOM_ICDF(19155), AOM_ICDF(25498), AOM_ICDF(26898),
+ AOM_ICDF(27176), AOM_ICDF(30160), AOM_ICDF(30652), AOM_ICDF(32510),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8631), AOM_ICDF(8948), AOM_ICDF(15992), AOM_ICDF(16723),
- AOM_ICDF(17052), AOM_ICDF(17347), AOM_ICDF(18423), AOM_ICDF(24863),
- AOM_ICDF(25407), AOM_ICDF(29104), AOM_ICDF(29908), AOM_ICDF(32461),
+ { AOM_ICDF(8721), AOM_ICDF(8970), AOM_ICDF(16785), AOM_ICDF(17446),
+ AOM_ICDF(17649), AOM_ICDF(17826), AOM_ICDF(18746), AOM_ICDF(25927),
+ AOM_ICDF(26396), AOM_ICDF(29702), AOM_ICDF(30461), AOM_ICDF(32528),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11023), AOM_ICDF(12240), AOM_ICDF(15597), AOM_ICDF(16534),
- AOM_ICDF(17071), AOM_ICDF(17737), AOM_ICDF(18796), AOM_ICDF(21437),
- AOM_ICDF(23341), AOM_ICDF(28473), AOM_ICDF(29855), AOM_ICDF(31981),
+ { AOM_ICDF(11404), AOM_ICDF(12417), AOM_ICDF(15834), AOM_ICDF(17066),
+ AOM_ICDF(17441), AOM_ICDF(18014), AOM_ICDF(18966), AOM_ICDF(21819),
+ AOM_ICDF(24083), AOM_ICDF(29077), AOM_ICDF(30376), AOM_ICDF(32213),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10753), AOM_ICDF(11382), AOM_ICDF(17299), AOM_ICDF(17832),
- AOM_ICDF(18289), AOM_ICDF(18625), AOM_ICDF(20074), AOM_ICDF(22427),
- AOM_ICDF(23100), AOM_ICDF(28078), AOM_ICDF(29471), AOM_ICDF(32149),
+ { AOM_ICDF(11450), AOM_ICDF(11958), AOM_ICDF(18297), AOM_ICDF(18820),
+ AOM_ICDF(19165), AOM_ICDF(19479), AOM_ICDF(20809), AOM_ICDF(23280),
+ AOM_ICDF(23916), AOM_ICDF(28662), AOM_ICDF(29933), AOM_ICDF(32364),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10313), AOM_ICDF(11269), AOM_ICDF(17166), AOM_ICDF(17673),
- AOM_ICDF(18151), AOM_ICDF(18692), AOM_ICDF(19672), AOM_ICDF(21792),
- AOM_ICDF(22576), AOM_ICDF(27704), AOM_ICDF(29619), AOM_ICDF(31579),
+ { AOM_ICDF(10920), AOM_ICDF(11607), AOM_ICDF(17980), AOM_ICDF(18561),
+ AOM_ICDF(18921), AOM_ICDF(19301), AOM_ICDF(20390), AOM_ICDF(22706),
+ AOM_ICDF(23413), AOM_ICDF(28156), AOM_ICDF(30004), AOM_ICDF(31872),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10720), AOM_ICDF(11313), AOM_ICDF(18941), AOM_ICDF(19366),
- AOM_ICDF(19652), AOM_ICDF(19873), AOM_ICDF(21300), AOM_ICDF(23331),
- AOM_ICDF(23881), AOM_ICDF(28269), AOM_ICDF(29089), AOM_ICDF(32277),
+ { AOM_ICDF(11462), AOM_ICDF(11962), AOM_ICDF(19642), AOM_ICDF(20131),
+ AOM_ICDF(20369), AOM_ICDF(20530), AOM_ICDF(21898), AOM_ICDF(24152),
+ AOM_ICDF(24686), AOM_ICDF(28899), AOM_ICDF(29656), AOM_ICDF(32424),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8180), AOM_ICDF(9323), AOM_ICDF(21560), AOM_ICDF(21813),
- AOM_ICDF(22010), AOM_ICDF(22154), AOM_ICDF(22616), AOM_ICDF(23667),
- AOM_ICDF(24016), AOM_ICDF(26237), AOM_ICDF(26987), AOM_ICDF(28357),
+ { AOM_ICDF(8171), AOM_ICDF(9219), AOM_ICDF(21810), AOM_ICDF(22146),
+ AOM_ICDF(22350), AOM_ICDF(22480), AOM_ICDF(22930), AOM_ICDF(24054),
+ AOM_ICDF(24405), AOM_ICDF(26437), AOM_ICDF(27109), AOM_ICDF(28397),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(10172), AOM_ICDF(11421), AOM_ICDF(12846), AOM_ICDF(15909),
- AOM_ICDF(16607), AOM_ICDF(17623), AOM_ICDF(18407), AOM_ICDF(21189),
- AOM_ICDF(23685), AOM_ICDF(28774), AOM_ICDF(30140), AOM_ICDF(32352),
+ { { AOM_ICDF(12474), AOM_ICDF(13429), AOM_ICDF(14740), AOM_ICDF(17535),
+ AOM_ICDF(18021), AOM_ICDF(18752), AOM_ICDF(19551), AOM_ICDF(22163),
+ AOM_ICDF(24563), AOM_ICDF(29410), AOM_ICDF(30687), AOM_ICDF(32505),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9477), AOM_ICDF(15260), AOM_ICDF(15998), AOM_ICDF(18783),
- AOM_ICDF(19275), AOM_ICDF(20014), AOM_ICDF(20539), AOM_ICDF(21856),
- AOM_ICDF(25743), AOM_ICDF(29266), AOM_ICDF(30937), AOM_ICDF(32136),
+ { AOM_ICDF(9862), AOM_ICDF(15025), AOM_ICDF(15766), AOM_ICDF(18942),
+ AOM_ICDF(19321), AOM_ICDF(20031), AOM_ICDF(20492), AOM_ICDF(21747),
+ AOM_ICDF(25671), AOM_ICDF(29272), AOM_ICDF(30926), AOM_ICDF(32270),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8467), AOM_ICDF(9200), AOM_ICDF(16596), AOM_ICDF(18669),
- AOM_ICDF(19026), AOM_ICDF(19402), AOM_ICDF(20482), AOM_ICDF(23568),
- AOM_ICDF(24783), AOM_ICDF(28631), AOM_ICDF(29470), AOM_ICDF(31572),
+ { AOM_ICDF(8764), AOM_ICDF(9426), AOM_ICDF(17676), AOM_ICDF(19605),
+ AOM_ICDF(19945), AOM_ICDF(20174), AOM_ICDF(21106), AOM_ICDF(24312),
+ AOM_ICDF(25470), AOM_ICDF(29242), AOM_ICDF(30066), AOM_ICDF(31831),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7638), AOM_ICDF(7974), AOM_ICDF(8650), AOM_ICDF(18342),
- AOM_ICDF(18451), AOM_ICDF(18616), AOM_ICDF(18769), AOM_ICDF(23626),
- AOM_ICDF(26542), AOM_ICDF(30257), AOM_ICDF(31146), AOM_ICDF(32515),
+ { AOM_ICDF(8566), AOM_ICDF(9030), AOM_ICDF(9692), AOM_ICDF(18683),
+ AOM_ICDF(18787), AOM_ICDF(18968), AOM_ICDF(19155), AOM_ICDF(23451),
+ AOM_ICDF(26278), AOM_ICDF(30299), AOM_ICDF(31208), AOM_ICDF(32537),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6191), AOM_ICDF(7379), AOM_ICDF(7921), AOM_ICDF(11465),
- AOM_ICDF(19344), AOM_ICDF(21824), AOM_ICDF(23367), AOM_ICDF(24639),
- AOM_ICDF(26786), AOM_ICDF(30538), AOM_ICDF(31559), AOM_ICDF(32705),
+ { AOM_ICDF(7535), AOM_ICDF(8616), AOM_ICDF(9353), AOM_ICDF(13056),
+ AOM_ICDF(18938), AOM_ICDF(21199), AOM_ICDF(22627), AOM_ICDF(23971),
+ AOM_ICDF(26022), AOM_ICDF(30131), AOM_ICDF(31243), AOM_ICDF(32618),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8086), AOM_ICDF(9985), AOM_ICDF(10747), AOM_ICDF(14358),
- AOM_ICDF(15952), AOM_ICDF(22105), AOM_ICDF(22868), AOM_ICDF(24072),
- AOM_ICDF(27377), AOM_ICDF(30344), AOM_ICDF(31208), AOM_ICDF(32582),
+ { AOM_ICDF(9138), AOM_ICDF(11001), AOM_ICDF(11570), AOM_ICDF(14638),
+ AOM_ICDF(16000), AOM_ICDF(20926), AOM_ICDF(21803), AOM_ICDF(23237),
+ AOM_ICDF(26287), AOM_ICDF(30063), AOM_ICDF(31128), AOM_ICDF(32599),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8550), AOM_ICDF(9145), AOM_ICDF(10873), AOM_ICDF(12918),
- AOM_ICDF(15111), AOM_ICDF(15984), AOM_ICDF(20073), AOM_ICDF(22322),
- AOM_ICDF(23828), AOM_ICDF(28828), AOM_ICDF(29924), AOM_ICDF(32359),
+ { AOM_ICDF(9729), AOM_ICDF(10184), AOM_ICDF(11919), AOM_ICDF(13759),
+ AOM_ICDF(15439), AOM_ICDF(16099), AOM_ICDF(20564), AOM_ICDF(22949),
+ AOM_ICDF(24424), AOM_ICDF(29313), AOM_ICDF(30373), AOM_ICDF(32518),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7394), AOM_ICDF(7940), AOM_ICDF(9159), AOM_ICDF(14486),
- AOM_ICDF(14820), AOM_ICDF(15244), AOM_ICDF(15870), AOM_ICDF(23073),
- AOM_ICDF(25178), AOM_ICDF(29413), AOM_ICDF(30388), AOM_ICDF(32662),
+ { AOM_ICDF(8615), AOM_ICDF(9090), AOM_ICDF(10462), AOM_ICDF(14832),
+ AOM_ICDF(15157), AOM_ICDF(15466), AOM_ICDF(16143), AOM_ICDF(22773),
+ AOM_ICDF(24815), AOM_ICDF(29574), AOM_ICDF(30593), AOM_ICDF(32635),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8460), AOM_ICDF(9458), AOM_ICDF(10078), AOM_ICDF(15538),
- AOM_ICDF(15798), AOM_ICDF(16350), AOM_ICDF(16672), AOM_ICDF(19281),
- AOM_ICDF(25430), AOM_ICDF(29576), AOM_ICDF(31163), AOM_ICDF(32322),
+ { AOM_ICDF(9258), AOM_ICDF(10308), AOM_ICDF(10884), AOM_ICDF(15905),
+ AOM_ICDF(16092), AOM_ICDF(16466), AOM_ICDF(16802), AOM_ICDF(19277),
+ AOM_ICDF(25235), AOM_ICDF(29804), AOM_ICDF(31328), AOM_ICDF(32508),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8789), AOM_ICDF(9969), AOM_ICDF(11133), AOM_ICDF(14564),
- AOM_ICDF(15097), AOM_ICDF(15907), AOM_ICDF(16546), AOM_ICDF(19691),
- AOM_ICDF(22509), AOM_ICDF(28254), AOM_ICDF(29959), AOM_ICDF(32470),
+ { AOM_ICDF(10403), AOM_ICDF(11313), AOM_ICDF(12386), AOM_ICDF(15442),
+ AOM_ICDF(15884), AOM_ICDF(16549), AOM_ICDF(17269), AOM_ICDF(20362),
+ AOM_ICDF(22913), AOM_ICDF(28783), AOM_ICDF(30284), AOM_ICDF(32578),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8001), AOM_ICDF(9680), AOM_ICDF(10745), AOM_ICDF(14077),
- AOM_ICDF(14595), AOM_ICDF(15824), AOM_ICDF(16725), AOM_ICDF(19620),
- AOM_ICDF(22992), AOM_ICDF(28303), AOM_ICDF(30338), AOM_ICDF(32140),
+ { AOM_ICDF(9620), AOM_ICDF(10894), AOM_ICDF(11874), AOM_ICDF(14923),
+ AOM_ICDF(15398), AOM_ICDF(16326), AOM_ICDF(17076), AOM_ICDF(20069),
+ AOM_ICDF(23137), AOM_ICDF(28656), AOM_ICDF(30608), AOM_ICDF(32331),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8980), AOM_ICDF(9914), AOM_ICDF(11658), AOM_ICDF(15050),
- AOM_ICDF(15570), AOM_ICDF(16341), AOM_ICDF(17131), AOM_ICDF(20551),
- AOM_ICDF(22738), AOM_ICDF(28827), AOM_ICDF(30061), AOM_ICDF(32402),
+ { AOM_ICDF(10095), AOM_ICDF(10981), AOM_ICDF(12537), AOM_ICDF(15703),
+ AOM_ICDF(16165), AOM_ICDF(16741), AOM_ICDF(17550), AOM_ICDF(20754),
+ AOM_ICDF(22975), AOM_ICDF(29162), AOM_ICDF(30500), AOM_ICDF(32582),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7822), AOM_ICDF(10616), AOM_ICDF(14494), AOM_ICDF(17978),
- AOM_ICDF(18701), AOM_ICDF(19227), AOM_ICDF(19819), AOM_ICDF(21396),
- AOM_ICDF(24683), AOM_ICDF(28364), AOM_ICDF(29744), AOM_ICDF(31059),
+ { AOM_ICDF(8858), AOM_ICDF(11204), AOM_ICDF(14847), AOM_ICDF(18228),
+ AOM_ICDF(18741), AOM_ICDF(19060), AOM_ICDF(19629), AOM_ICDF(21234),
+ AOM_ICDF(24400), AOM_ICDF(27622), AOM_ICDF(29011), AOM_ICDF(30627),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(8039), AOM_ICDF(8786), AOM_ICDF(9830), AOM_ICDF(10103),
- AOM_ICDF(20359), AOM_ICDF(22776), AOM_ICDF(25623), AOM_ICDF(27112),
- AOM_ICDF(27796), AOM_ICDF(30906), AOM_ICDF(31800), AOM_ICDF(32577),
+ { { AOM_ICDF(9911), AOM_ICDF(10689), AOM_ICDF(11787), AOM_ICDF(12138),
+ AOM_ICDF(19892), AOM_ICDF(22168), AOM_ICDF(24984), AOM_ICDF(26365),
+ AOM_ICDF(27052), AOM_ICDF(30676), AOM_ICDF(31618), AOM_ICDF(32577),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9208), AOM_ICDF(12932), AOM_ICDF(13532), AOM_ICDF(13954),
- AOM_ICDF(20047), AOM_ICDF(23446), AOM_ICDF(25142), AOM_ICDF(26115),
- AOM_ICDF(27381), AOM_ICDF(30318), AOM_ICDF(31519), AOM_ICDF(32362),
+ { AOM_ICDF(10405), AOM_ICDF(14007), AOM_ICDF(14667), AOM_ICDF(15051),
+ AOM_ICDF(20542), AOM_ICDF(23567), AOM_ICDF(25261), AOM_ICDF(26243),
+ AOM_ICDF(27418), AOM_ICDF(30244), AOM_ICDF(31480), AOM_ICDF(32398),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6687), AOM_ICDF(7356), AOM_ICDF(15673), AOM_ICDF(15999),
- AOM_ICDF(19895), AOM_ICDF(21099), AOM_ICDF(24208), AOM_ICDF(25813),
- AOM_ICDF(26390), AOM_ICDF(29266), AOM_ICDF(30185), AOM_ICDF(31698),
+ { AOM_ICDF(7972), AOM_ICDF(8563), AOM_ICDF(16778), AOM_ICDF(17053),
+ AOM_ICDF(20474), AOM_ICDF(21431), AOM_ICDF(24348), AOM_ICDF(26064),
+ AOM_ICDF(26466), AOM_ICDF(29456), AOM_ICDF(30241), AOM_ICDF(31822),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8787), AOM_ICDF(9245), AOM_ICDF(9855), AOM_ICDF(11685),
- AOM_ICDF(16994), AOM_ICDF(19130), AOM_ICDF(20808), AOM_ICDF(24500),
- AOM_ICDF(25964), AOM_ICDF(29717), AOM_ICDF(31273), AOM_ICDF(32402),
+ { AOM_ICDF(10502), AOM_ICDF(10858), AOM_ICDF(11637), AOM_ICDF(13369),
+ AOM_ICDF(16831), AOM_ICDF(18528), AOM_ICDF(20122), AOM_ICDF(23814),
+ AOM_ICDF(25350), AOM_ICDF(29741), AOM_ICDF(31151), AOM_ICDF(32539),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(4385), AOM_ICDF(4523), AOM_ICDF(4655), AOM_ICDF(4810),
- AOM_ICDF(26851), AOM_ICDF(28440), AOM_ICDF(30339), AOM_ICDF(31344),
- AOM_ICDF(31584), AOM_ICDF(32338), AOM_ICDF(32498), AOM_ICDF(32737),
+ { AOM_ICDF(4993), AOM_ICDF(5184), AOM_ICDF(5393), AOM_ICDF(5580),
+ AOM_ICDF(25670), AOM_ICDF(27769), AOM_ICDF(29927), AOM_ICDF(30768),
+ AOM_ICDF(31020), AOM_ICDF(32139), AOM_ICDF(32371), AOM_ICDF(32721),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6956), AOM_ICDF(7964), AOM_ICDF(8305), AOM_ICDF(8625),
- AOM_ICDF(18877), AOM_ICDF(27031), AOM_ICDF(28388), AOM_ICDF(29602),
- AOM_ICDF(30357), AOM_ICDF(31751), AOM_ICDF(32292), AOM_ICDF(32706),
+ { AOM_ICDF(6994), AOM_ICDF(8042), AOM_ICDF(8425), AOM_ICDF(8775),
+ AOM_ICDF(18573), AOM_ICDF(26670), AOM_ICDF(27998), AOM_ICDF(29060),
+ AOM_ICDF(29741), AOM_ICDF(31512), AOM_ICDF(32140), AOM_ICDF(32705),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5285), AOM_ICDF(5541), AOM_ICDF(6504), AOM_ICDF(6727),
- AOM_ICDF(19289), AOM_ICDF(20601), AOM_ICDF(27873), AOM_ICDF(29022),
- AOM_ICDF(29360), AOM_ICDF(31346), AOM_ICDF(31781), AOM_ICDF(32650),
+ { AOM_ICDF(6608), AOM_ICDF(6893), AOM_ICDF(7917), AOM_ICDF(8137),
+ AOM_ICDF(18180), AOM_ICDF(19484), AOM_ICDF(27302), AOM_ICDF(28268),
+ AOM_ICDF(28648), AOM_ICDF(31184), AOM_ICDF(31688), AOM_ICDF(32604),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5893), AOM_ICDF(6452), AOM_ICDF(7442), AOM_ICDF(7860),
- AOM_ICDF(15280), AOM_ICDF(16695), AOM_ICDF(18810), AOM_ICDF(27512),
- AOM_ICDF(28064), AOM_ICDF(30759), AOM_ICDF(31657), AOM_ICDF(32605),
+ { AOM_ICDF(7758), AOM_ICDF(8381), AOM_ICDF(9673), AOM_ICDF(10202),
+ AOM_ICDF(15951), AOM_ICDF(17361), AOM_ICDF(19451), AOM_ICDF(26253),
+ AOM_ICDF(26891), AOM_ICDF(30394), AOM_ICDF(31343), AOM_ICDF(32571),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8721), AOM_ICDF(10386), AOM_ICDF(10772), AOM_ICDF(11398),
- AOM_ICDF(16790), AOM_ICDF(19919), AOM_ICDF(21544), AOM_ICDF(23834),
- AOM_ICDF(26417), AOM_ICDF(30318), AOM_ICDF(31583), AOM_ICDF(32488),
+ { AOM_ICDF(9961), AOM_ICDF(11581), AOM_ICDF(12003), AOM_ICDF(12812),
+ AOM_ICDF(17402), AOM_ICDF(19995), AOM_ICDF(21609), AOM_ICDF(23735),
+ AOM_ICDF(25957), AOM_ICDF(29973), AOM_ICDF(31339), AOM_ICDF(32560),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8789), AOM_ICDF(9593), AOM_ICDF(10608), AOM_ICDF(11035),
- AOM_ICDF(18292), AOM_ICDF(20797), AOM_ICDF(23160), AOM_ICDF(24817),
- AOM_ICDF(25673), AOM_ICDF(29972), AOM_ICDF(31183), AOM_ICDF(32564),
+ { AOM_ICDF(10245), AOM_ICDF(10965), AOM_ICDF(11887), AOM_ICDF(12326),
+ AOM_ICDF(18409), AOM_ICDF(20778), AOM_ICDF(23127), AOM_ICDF(24779),
+ AOM_ICDF(25560), AOM_ICDF(30046), AOM_ICDF(31167), AOM_ICDF(32588),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8277), AOM_ICDF(9445), AOM_ICDF(10353), AOM_ICDF(10801),
- AOM_ICDF(17569), AOM_ICDF(20776), AOM_ICDF(23205), AOM_ICDF(24526),
- AOM_ICDF(25575), AOM_ICDF(30044), AOM_ICDF(31542), AOM_ICDF(32461),
+ { AOM_ICDF(9047), AOM_ICDF(10157), AOM_ICDF(11136), AOM_ICDF(11600),
+ AOM_ICDF(17607), AOM_ICDF(20541), AOM_ICDF(22746), AOM_ICDF(24278),
+ AOM_ICDF(25239), AOM_ICDF(29844), AOM_ICDF(31296), AOM_ICDF(32466),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8541), AOM_ICDF(9434), AOM_ICDF(10872), AOM_ICDF(11210),
- AOM_ICDF(17190), AOM_ICDF(19205), AOM_ICDF(21809), AOM_ICDF(24140),
- AOM_ICDF(24805), AOM_ICDF(29282), AOM_ICDF(30851), AOM_ICDF(32615),
+ { AOM_ICDF(10318), AOM_ICDF(11227), AOM_ICDF(12470), AOM_ICDF(12792),
+ AOM_ICDF(17742), AOM_ICDF(19600), AOM_ICDF(22120), AOM_ICDF(24346),
+ AOM_ICDF(25079), AOM_ICDF(29588), AOM_ICDF(30917), AOM_ICDF(32593),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7308), AOM_ICDF(9573), AOM_ICDF(15269), AOM_ICDF(15681),
- AOM_ICDF(19283), AOM_ICDF(21136), AOM_ICDF(22680), AOM_ICDF(23607),
- AOM_ICDF(24464), AOM_ICDF(28102), AOM_ICDF(29200), AOM_ICDF(30298),
+ { AOM_ICDF(8281), AOM_ICDF(10602), AOM_ICDF(15452), AOM_ICDF(15940),
+ AOM_ICDF(19120), AOM_ICDF(20702), AOM_ICDF(22521), AOM_ICDF(23526),
+ AOM_ICDF(24236), AOM_ICDF(27829), AOM_ICDF(28776), AOM_ICDF(29973),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(8664), AOM_ICDF(11370), AOM_ICDF(12410), AOM_ICDF(12765),
- AOM_ICDF(15443), AOM_ICDF(24216), AOM_ICDF(25135), AOM_ICDF(26205),
- AOM_ICDF(27268), AOM_ICDF(30294), AOM_ICDF(31526), AOM_ICDF(32335),
+ { { AOM_ICDF(9850), AOM_ICDF(12693), AOM_ICDF(13536), AOM_ICDF(13937),
+ AOM_ICDF(16080), AOM_ICDF(23341), AOM_ICDF(24177), AOM_ICDF(25258),
+ AOM_ICDF(26372), AOM_ICDF(30167), AOM_ICDF(31506), AOM_ICDF(32425),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8256), AOM_ICDF(14870), AOM_ICDF(15315), AOM_ICDF(15581),
- AOM_ICDF(17220), AOM_ICDF(25672), AOM_ICDF(26098), AOM_ICDF(26899),
- AOM_ICDF(28215), AOM_ICDF(30483), AOM_ICDF(31901), AOM_ICDF(32314),
+ { AOM_ICDF(8537), AOM_ICDF(15828), AOM_ICDF(16155), AOM_ICDF(16425),
+ AOM_ICDF(17738), AOM_ICDF(25313), AOM_ICDF(25706), AOM_ICDF(26423),
+ AOM_ICDF(27642), AOM_ICDF(30290), AOM_ICDF(31795), AOM_ICDF(32372),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7956), AOM_ICDF(9249), AOM_ICDF(15652), AOM_ICDF(16105),
- AOM_ICDF(17168), AOM_ICDF(21306), AOM_ICDF(22286), AOM_ICDF(24173),
- AOM_ICDF(25027), AOM_ICDF(28430), AOM_ICDF(29195), AOM_ICDF(30614),
+ { AOM_ICDF(8805), AOM_ICDF(10168), AOM_ICDF(16679), AOM_ICDF(17136),
+ AOM_ICDF(18480), AOM_ICDF(21724), AOM_ICDF(22707), AOM_ICDF(24501),
+ AOM_ICDF(25226), AOM_ICDF(28734), AOM_ICDF(29582), AOM_ICDF(31015),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11006), AOM_ICDF(13213), AOM_ICDF(14107), AOM_ICDF(16147),
- AOM_ICDF(17543), AOM_ICDF(22013), AOM_ICDF(23102), AOM_ICDF(25086),
- AOM_ICDF(27013), AOM_ICDF(30086), AOM_ICDF(31567), AOM_ICDF(32433),
+ { AOM_ICDF(11887), AOM_ICDF(13456), AOM_ICDF(14000), AOM_ICDF(16402),
+ AOM_ICDF(17550), AOM_ICDF(20969), AOM_ICDF(21942), AOM_ICDF(24081),
+ AOM_ICDF(26141), AOM_ICDF(29735), AOM_ICDF(31365), AOM_ICDF(32610),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(4793), AOM_ICDF(6248), AOM_ICDF(6507), AOM_ICDF(6861),
- AOM_ICDF(16735), AOM_ICDF(27114), AOM_ICDF(28262), AOM_ICDF(29039),
- AOM_ICDF(29824), AOM_ICDF(31497), AOM_ICDF(32246), AOM_ICDF(32589),
+ { AOM_ICDF(5462), AOM_ICDF(6783), AOM_ICDF(7085), AOM_ICDF(7427),
+ AOM_ICDF(16960), AOM_ICDF(26746), AOM_ICDF(27970), AOM_ICDF(28609),
+ AOM_ICDF(29343), AOM_ICDF(31379), AOM_ICDF(32138), AOM_ICDF(32593),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(4478), AOM_ICDF(6285), AOM_ICDF(6409), AOM_ICDF(6705),
- AOM_ICDF(8890), AOM_ICDF(29016), AOM_ICDF(29270), AOM_ICDF(29910),
- AOM_ICDF(30605), AOM_ICDF(31955), AOM_ICDF(32438), AOM_ICDF(32645),
+ { AOM_ICDF(4786), AOM_ICDF(7121), AOM_ICDF(7242), AOM_ICDF(7469),
+ AOM_ICDF(9622), AOM_ICDF(28427), AOM_ICDF(28700), AOM_ICDF(29374),
+ AOM_ICDF(30121), AOM_ICDF(31764), AOM_ICDF(32356), AOM_ICDF(32637),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8257), AOM_ICDF(9389), AOM_ICDF(10185), AOM_ICDF(10496),
- AOM_ICDF(14992), AOM_ICDF(20940), AOM_ICDF(25497), AOM_ICDF(26750),
- AOM_ICDF(27719), AOM_ICDF(30494), AOM_ICDF(31264), AOM_ICDF(32405),
+ { AOM_ICDF(9172), AOM_ICDF(10388), AOM_ICDF(11156), AOM_ICDF(11527),
+ AOM_ICDF(15483), AOM_ICDF(20332), AOM_ICDF(24727), AOM_ICDF(25954),
+ AOM_ICDF(26870), AOM_ICDF(30198), AOM_ICDF(31246), AOM_ICDF(32352),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7161), AOM_ICDF(8818), AOM_ICDF(10306), AOM_ICDF(11095),
- AOM_ICDF(13017), AOM_ICDF(18476), AOM_ICDF(19264), AOM_ICDF(24569),
- AOM_ICDF(25976), AOM_ICDF(29504), AOM_ICDF(31052), AOM_ICDF(32363),
+ { AOM_ICDF(8102), AOM_ICDF(9847), AOM_ICDF(11124), AOM_ICDF(11911),
+ AOM_ICDF(13567), AOM_ICDF(18203), AOM_ICDF(19081), AOM_ICDF(24364),
+ AOM_ICDF(25695), AOM_ICDF(29586), AOM_ICDF(31057), AOM_ICDF(32380),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9370), AOM_ICDF(12297), AOM_ICDF(13076), AOM_ICDF(13874),
- AOM_ICDF(15777), AOM_ICDF(21413), AOM_ICDF(22120), AOM_ICDF(23271),
- AOM_ICDF(26416), AOM_ICDF(29651), AOM_ICDF(31400), AOM_ICDF(32224),
+ { AOM_ICDF(10488), AOM_ICDF(13506), AOM_ICDF(14020), AOM_ICDF(14824),
+ AOM_ICDF(16307), AOM_ICDF(20899), AOM_ICDF(21549), AOM_ICDF(22906),
+ AOM_ICDF(25886), AOM_ICDF(29488), AOM_ICDF(31408), AOM_ICDF(32369),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7929), AOM_ICDF(10411), AOM_ICDF(11126), AOM_ICDF(11534),
- AOM_ICDF(13508), AOM_ICDF(20763), AOM_ICDF(21762), AOM_ICDF(23049),
- AOM_ICDF(24355), AOM_ICDF(28944), AOM_ICDF(31000), AOM_ICDF(32319),
+ { AOM_ICDF(9407), AOM_ICDF(11928), AOM_ICDF(12529), AOM_ICDF(12941),
+ AOM_ICDF(14674), AOM_ICDF(20905), AOM_ICDF(21782), AOM_ICDF(23113),
+ AOM_ICDF(24351), AOM_ICDF(29073), AOM_ICDF(31009), AOM_ICDF(32410),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7599), AOM_ICDF(10683), AOM_ICDF(11296), AOM_ICDF(11640),
- AOM_ICDF(13742), AOM_ICDF(21259), AOM_ICDF(21856), AOM_ICDF(22977),
- AOM_ICDF(24351), AOM_ICDF(28793), AOM_ICDF(31067), AOM_ICDF(32204),
+ { AOM_ICDF(8764), AOM_ICDF(11728), AOM_ICDF(12298), AOM_ICDF(12713),
+ AOM_ICDF(14609), AOM_ICDF(21424), AOM_ICDF(22115), AOM_ICDF(23419),
+ AOM_ICDF(24779), AOM_ICDF(29206), AOM_ICDF(31355), AOM_ICDF(32390),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8441), AOM_ICDF(10704), AOM_ICDF(11825), AOM_ICDF(12309),
- AOM_ICDF(14184), AOM_ICDF(20131), AOM_ICDF(21281), AOM_ICDF(23118),
- AOM_ICDF(24375), AOM_ICDF(29307), AOM_ICDF(31115), AOM_ICDF(32439),
+ { AOM_ICDF(9517), AOM_ICDF(11912), AOM_ICDF(12950), AOM_ICDF(13401),
+ AOM_ICDF(15075), AOM_ICDF(20426), AOM_ICDF(21436), AOM_ICDF(23153),
+ AOM_ICDF(24539), AOM_ICDF(29531), AOM_ICDF(31132), AOM_ICDF(32469),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8165), AOM_ICDF(12834), AOM_ICDF(16373), AOM_ICDF(16928),
- AOM_ICDF(17951), AOM_ICDF(23004), AOM_ICDF(23643), AOM_ICDF(24986),
- AOM_ICDF(25903), AOM_ICDF(28739), AOM_ICDF(29869), AOM_ICDF(30274),
+ { AOM_ICDF(8253), AOM_ICDF(12956), AOM_ICDF(16212), AOM_ICDF(16664),
+ AOM_ICDF(17756), AOM_ICDF(22714), AOM_ICDF(23216), AOM_ICDF(24249),
+ AOM_ICDF(25321), AOM_ICDF(28440), AOM_ICDF(29620), AOM_ICDF(30259),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(10596), AOM_ICDF(11287), AOM_ICDF(14467), AOM_ICDF(14914),
- AOM_ICDF(16618), AOM_ICDF(17393), AOM_ICDF(23260), AOM_ICDF(25104),
- AOM_ICDF(25730), AOM_ICDF(29585), AOM_ICDF(30516), AOM_ICDF(32427),
+ { { AOM_ICDF(11792), AOM_ICDF(12317), AOM_ICDF(15563), AOM_ICDF(16032),
+ AOM_ICDF(17398), AOM_ICDF(17977), AOM_ICDF(23384), AOM_ICDF(25171),
+ AOM_ICDF(25807), AOM_ICDF(29850), AOM_ICDF(30737), AOM_ICDF(32541),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10613), AOM_ICDF(13527), AOM_ICDF(15273), AOM_ICDF(15841),
- AOM_ICDF(17224), AOM_ICDF(18541), AOM_ICDF(21867), AOM_ICDF(24049),
- AOM_ICDF(25457), AOM_ICDF(28964), AOM_ICDF(30751), AOM_ICDF(32043),
+ { AOM_ICDF(10922), AOM_ICDF(14049), AOM_ICDF(15834), AOM_ICDF(16386),
+ AOM_ICDF(17629), AOM_ICDF(18873), AOM_ICDF(22496), AOM_ICDF(24451),
+ AOM_ICDF(25744), AOM_ICDF(29328), AOM_ICDF(30878), AOM_ICDF(32141),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7136), AOM_ICDF(7384), AOM_ICDF(17531), AOM_ICDF(17740),
- AOM_ICDF(18409), AOM_ICDF(18657), AOM_ICDF(24384), AOM_ICDF(26440),
- AOM_ICDF(26794), AOM_ICDF(29647), AOM_ICDF(30088), AOM_ICDF(32250),
+ { AOM_ICDF(8243), AOM_ICDF(8431), AOM_ICDF(19690), AOM_ICDF(19885),
+ AOM_ICDF(20402), AOM_ICDF(20560), AOM_ICDF(25644), AOM_ICDF(27470),
+ AOM_ICDF(27737), AOM_ICDF(30291), AOM_ICDF(30701), AOM_ICDF(32380),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10462), AOM_ICDF(10967), AOM_ICDF(12436), AOM_ICDF(14454),
- AOM_ICDF(15507), AOM_ICDF(16099), AOM_ICDF(19104), AOM_ICDF(22898),
- AOM_ICDF(24390), AOM_ICDF(29171), AOM_ICDF(30158), AOM_ICDF(32329),
+ { AOM_ICDF(11266), AOM_ICDF(11746), AOM_ICDF(13215), AOM_ICDF(15105),
+ AOM_ICDF(15916), AOM_ICDF(16497), AOM_ICDF(19044), AOM_ICDF(22912),
+ AOM_ICDF(24422), AOM_ICDF(29451), AOM_ICDF(30565), AOM_ICDF(32543),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6782), AOM_ICDF(7136), AOM_ICDF(7637), AOM_ICDF(7940),
- AOM_ICDF(19251), AOM_ICDF(20712), AOM_ICDF(28042), AOM_ICDF(28918),
- AOM_ICDF(29369), AOM_ICDF(31391), AOM_ICDF(31930), AOM_ICDF(32684),
+ { AOM_ICDF(7970), AOM_ICDF(8353), AOM_ICDF(8989), AOM_ICDF(9324),
+ AOM_ICDF(18715), AOM_ICDF(20136), AOM_ICDF(27478), AOM_ICDF(28360),
+ AOM_ICDF(28854), AOM_ICDF(31356), AOM_ICDF(31910), AOM_ICDF(32687),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9024), AOM_ICDF(10216), AOM_ICDF(11375), AOM_ICDF(11905),
- AOM_ICDF(14761), AOM_ICDF(20391), AOM_ICDF(25648), AOM_ICDF(27105),
- AOM_ICDF(28024), AOM_ICDF(30930), AOM_ICDF(31601), AOM_ICDF(32470),
+ { AOM_ICDF(9835), AOM_ICDF(10905), AOM_ICDF(11896), AOM_ICDF(12507),
+ AOM_ICDF(15383), AOM_ICDF(20329), AOM_ICDF(25102), AOM_ICDF(26520),
+ AOM_ICDF(27487), AOM_ICDF(30879), AOM_ICDF(31709), AOM_ICDF(32540),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(5813), AOM_ICDF(6034), AOM_ICDF(7989), AOM_ICDF(8114),
- AOM_ICDF(10924), AOM_ICDF(11225), AOM_ICDF(28185), AOM_ICDF(28923),
- AOM_ICDF(29237), AOM_ICDF(31248), AOM_ICDF(31647), AOM_ICDF(32662),
+ { AOM_ICDF(6779), AOM_ICDF(6957), AOM_ICDF(9270), AOM_ICDF(9436),
+ AOM_ICDF(11553), AOM_ICDF(11824), AOM_ICDF(27958), AOM_ICDF(28747),
+ AOM_ICDF(29030), AOM_ICDF(31268), AOM_ICDF(31664), AOM_ICDF(32666),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7491), AOM_ICDF(7994), AOM_ICDF(11413), AOM_ICDF(11959),
- AOM_ICDF(13179), AOM_ICDF(13687), AOM_ICDF(18214), AOM_ICDF(24758),
- AOM_ICDF(25577), AOM_ICDF(29670), AOM_ICDF(30574), AOM_ICDF(32479),
+ { AOM_ICDF(9125), AOM_ICDF(9475), AOM_ICDF(12773), AOM_ICDF(13383),
+ AOM_ICDF(14285), AOM_ICDF(14691), AOM_ICDF(18620), AOM_ICDF(24633),
+ AOM_ICDF(25338), AOM_ICDF(29728), AOM_ICDF(30582), AOM_ICDF(32548),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10983), AOM_ICDF(12364), AOM_ICDF(13793), AOM_ICDF(14773),
- AOM_ICDF(16130), AOM_ICDF(17050), AOM_ICDF(20089), AOM_ICDF(22802),
- AOM_ICDF(25405), AOM_ICDF(29426), AOM_ICDF(30927), AOM_ICDF(32453),
+ { AOM_ICDF(11721), AOM_ICDF(12709), AOM_ICDF(14065), AOM_ICDF(15136),
+ AOM_ICDF(16224), AOM_ICDF(17044), AOM_ICDF(20019), AOM_ICDF(22634),
+ AOM_ICDF(24974), AOM_ICDF(29533), AOM_ICDF(30976), AOM_ICDF(32540),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9964), AOM_ICDF(10535), AOM_ICDF(13010), AOM_ICDF(13474),
- AOM_ICDF(14913), AOM_ICDF(15740), AOM_ICDF(20576), AOM_ICDF(23046),
- AOM_ICDF(23908), AOM_ICDF(28854), AOM_ICDF(30036), AOM_ICDF(32460),
+ { AOM_ICDF(11134), AOM_ICDF(11581), AOM_ICDF(13908), AOM_ICDF(14421),
+ AOM_ICDF(15715), AOM_ICDF(16407), AOM_ICDF(20884), AOM_ICDF(23365),
+ AOM_ICDF(24142), AOM_ICDF(29151), AOM_ICDF(30333), AOM_ICDF(32546),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9775), AOM_ICDF(10750), AOM_ICDF(13036), AOM_ICDF(13575),
- AOM_ICDF(15210), AOM_ICDF(16176), AOM_ICDF(20342), AOM_ICDF(22861),
- AOM_ICDF(23837), AOM_ICDF(28958), AOM_ICDF(30451), AOM_ICDF(32331),
+ { AOM_ICDF(10621), AOM_ICDF(11354), AOM_ICDF(13725), AOM_ICDF(14331),
+ AOM_ICDF(15697), AOM_ICDF(16435), AOM_ICDF(20811), AOM_ICDF(23061),
+ AOM_ICDF(23916), AOM_ICDF(29068), AOM_ICDF(30630), AOM_ICDF(32382),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9961), AOM_ICDF(10492), AOM_ICDF(13516), AOM_ICDF(14107),
- AOM_ICDF(15387), AOM_ICDF(15771), AOM_ICDF(20972), AOM_ICDF(23526),
- AOM_ICDF(24197), AOM_ICDF(28915), AOM_ICDF(29903), AOM_ICDF(32536),
+ { AOM_ICDF(11037), AOM_ICDF(11497), AOM_ICDF(14490), AOM_ICDF(14987),
+ AOM_ICDF(16009), AOM_ICDF(16447), AOM_ICDF(21140), AOM_ICDF(23683),
+ AOM_ICDF(24312), AOM_ICDF(28995), AOM_ICDF(30105), AOM_ICDF(32639),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8458), AOM_ICDF(9928), AOM_ICDF(15988), AOM_ICDF(16486),
- AOM_ICDF(17503), AOM_ICDF(18295), AOM_ICDF(21981), AOM_ICDF(24039),
- AOM_ICDF(24966), AOM_ICDF(28109), AOM_ICDF(29150), AOM_ICDF(31117),
+ { AOM_ICDF(9605), AOM_ICDF(11018), AOM_ICDF(17444), AOM_ICDF(17875),
+ AOM_ICDF(18709), AOM_ICDF(19288), AOM_ICDF(22633), AOM_ICDF(24723),
+ AOM_ICDF(25518), AOM_ICDF(28726), AOM_ICDF(29835), AOM_ICDF(31394),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(11418), AOM_ICDF(12178), AOM_ICDF(14778), AOM_ICDF(16072),
- AOM_ICDF(16848), AOM_ICDF(17572), AOM_ICDF(18903), AOM_ICDF(22678),
- AOM_ICDF(23939), AOM_ICDF(28828), AOM_ICDF(30001), AOM_ICDF(32374),
+ { { AOM_ICDF(12284), AOM_ICDF(12942), AOM_ICDF(15497), AOM_ICDF(16898),
+ AOM_ICDF(17400), AOM_ICDF(17937), AOM_ICDF(19136), AOM_ICDF(23012),
+ AOM_ICDF(24306), AOM_ICDF(29247), AOM_ICDF(30360), AOM_ICDF(32526),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(11310), AOM_ICDF(15138), AOM_ICDF(16556), AOM_ICDF(17686),
- AOM_ICDF(18198), AOM_ICDF(19199), AOM_ICDF(20011), AOM_ICDF(22648),
- AOM_ICDF(24545), AOM_ICDF(28824), AOM_ICDF(30487), AOM_ICDF(32056),
+ { AOM_ICDF(11749), AOM_ICDF(15601), AOM_ICDF(16892), AOM_ICDF(18207),
+ AOM_ICDF(18593), AOM_ICDF(19416), AOM_ICDF(20162), AOM_ICDF(22890),
+ AOM_ICDF(24773), AOM_ICDF(28978), AOM_ICDF(30525), AOM_ICDF(32157),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8279), AOM_ICDF(8605), AOM_ICDF(17495), AOM_ICDF(18310),
- AOM_ICDF(18547), AOM_ICDF(18756), AOM_ICDF(20106), AOM_ICDF(24223),
- AOM_ICDF(24812), AOM_ICDF(28581), AOM_ICDF(29135), AOM_ICDF(32043),
+ { AOM_ICDF(8357), AOM_ICDF(8590), AOM_ICDF(18591), AOM_ICDF(19354),
+ AOM_ICDF(19529), AOM_ICDF(19661), AOM_ICDF(20764), AOM_ICDF(25434),
+ AOM_ICDF(25938), AOM_ICDF(29380), AOM_ICDF(29919), AOM_ICDF(32290),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8320), AOM_ICDF(8570), AOM_ICDF(9305), AOM_ICDF(14974),
- AOM_ICDF(15323), AOM_ICDF(15699), AOM_ICDF(16272), AOM_ICDF(23477),
- AOM_ICDF(25675), AOM_ICDF(29799), AOM_ICDF(30655), AOM_ICDF(32522),
+ { AOM_ICDF(9307), AOM_ICDF(9623), AOM_ICDF(10609), AOM_ICDF(15340),
+ AOM_ICDF(15587), AOM_ICDF(15878), AOM_ICDF(16422), AOM_ICDF(22905),
+ AOM_ICDF(25106), AOM_ICDF(29604), AOM_ICDF(30579), AOM_ICDF(32561),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7963), AOM_ICDF(8762), AOM_ICDF(9553), AOM_ICDF(10409),
- AOM_ICDF(20366), AOM_ICDF(22235), AOM_ICDF(24327), AOM_ICDF(26386),
- AOM_ICDF(27580), AOM_ICDF(30594), AOM_ICDF(31368), AOM_ICDF(32710),
+ { AOM_ICDF(9511), AOM_ICDF(10303), AOM_ICDF(11146), AOM_ICDF(12396),
+ AOM_ICDF(19000), AOM_ICDF(20742), AOM_ICDF(22883), AOM_ICDF(25043),
+ AOM_ICDF(26322), AOM_ICDF(30216), AOM_ICDF(31156), AOM_ICDF(32668),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10823), AOM_ICDF(12437), AOM_ICDF(13505), AOM_ICDF(14804),
- AOM_ICDF(16598), AOM_ICDF(22270), AOM_ICDF(23542), AOM_ICDF(26225),
- AOM_ICDF(28138), AOM_ICDF(30957), AOM_ICDF(31777), AOM_ICDF(32589),
+ { AOM_ICDF(11525), AOM_ICDF(12965), AOM_ICDF(13992), AOM_ICDF(15314),
+ AOM_ICDF(16559), AOM_ICDF(21108), AOM_ICDF(22323), AOM_ICDF(24844),
+ AOM_ICDF(26765), AOM_ICDF(30376), AOM_ICDF(31351), AOM_ICDF(32576),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8434), AOM_ICDF(9025), AOM_ICDF(11982), AOM_ICDF(13017),
- AOM_ICDF(14508), AOM_ICDF(15161), AOM_ICDF(20496), AOM_ICDF(23435),
- AOM_ICDF(24464), AOM_ICDF(28948), AOM_ICDF(29682), AOM_ICDF(32528),
+ { AOM_ICDF(9919), AOM_ICDF(10382), AOM_ICDF(13106), AOM_ICDF(14128),
+ AOM_ICDF(15212), AOM_ICDF(15741), AOM_ICDF(20216), AOM_ICDF(23213),
+ AOM_ICDF(24169), AOM_ICDF(29046), AOM_ICDF(29869), AOM_ICDF(32570),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7591), AOM_ICDF(7896), AOM_ICDF(9353), AOM_ICDF(11217),
- AOM_ICDF(11995), AOM_ICDF(12443), AOM_ICDF(13118), AOM_ICDF(26178),
- AOM_ICDF(27158), AOM_ICDF(30228), AOM_ICDF(30751), AOM_ICDF(32599),
+ { AOM_ICDF(8056), AOM_ICDF(8456), AOM_ICDF(10218), AOM_ICDF(11714),
+ AOM_ICDF(12070), AOM_ICDF(12383), AOM_ICDF(12849), AOM_ICDF(26222),
+ AOM_ICDF(27079), AOM_ICDF(30222), AOM_ICDF(30828), AOM_ICDF(32606),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9741), AOM_ICDF(10531), AOM_ICDF(11835), AOM_ICDF(14655),
- AOM_ICDF(15272), AOM_ICDF(16024), AOM_ICDF(16803), AOM_ICDF(20770),
- AOM_ICDF(23963), AOM_ICDF(29093), AOM_ICDF(30565), AOM_ICDF(32465),
+ { AOM_ICDF(10700), AOM_ICDF(11453), AOM_ICDF(12659), AOM_ICDF(15291),
+ AOM_ICDF(15677), AOM_ICDF(16240), AOM_ICDF(16902), AOM_ICDF(20777),
+ AOM_ICDF(24142), AOM_ICDF(29325), AOM_ICDF(30729), AOM_ICDF(32560),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10068), AOM_ICDF(10828), AOM_ICDF(12864), AOM_ICDF(14379),
- AOM_ICDF(14989), AOM_ICDF(15531), AOM_ICDF(16748), AOM_ICDF(20910),
- AOM_ICDF(22272), AOM_ICDF(27963), AOM_ICDF(29458), AOM_ICDF(32440),
+ { AOM_ICDF(10863), AOM_ICDF(11450), AOM_ICDF(13506), AOM_ICDF(14976),
+ AOM_ICDF(15428), AOM_ICDF(15869), AOM_ICDF(17051), AOM_ICDF(21294),
+ AOM_ICDF(22705), AOM_ICDF(28406), AOM_ICDF(29836), AOM_ICDF(32553),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9394), AOM_ICDF(10419), AOM_ICDF(12731), AOM_ICDF(14242),
- AOM_ICDF(14801), AOM_ICDF(15530), AOM_ICDF(16594), AOM_ICDF(20418),
- AOM_ICDF(21988), AOM_ICDF(27762), AOM_ICDF(29897), AOM_ICDF(32137),
+ { AOM_ICDF(10357), AOM_ICDF(11196), AOM_ICDF(13312), AOM_ICDF(14910),
+ AOM_ICDF(15380), AOM_ICDF(15977), AOM_ICDF(16957), AOM_ICDF(20978),
+ AOM_ICDF(22542), AOM_ICDF(28263), AOM_ICDF(30186), AOM_ICDF(32369),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9413), AOM_ICDF(9972), AOM_ICDF(12967), AOM_ICDF(14605),
- AOM_ICDF(15140), AOM_ICDF(15515), AOM_ICDF(16969), AOM_ICDF(21429),
- AOM_ICDF(22595), AOM_ICDF(28325), AOM_ICDF(29537), AOM_ICDF(32435),
+ { AOM_ICDF(10325), AOM_ICDF(10858), AOM_ICDF(13637), AOM_ICDF(15045),
+ AOM_ICDF(15455), AOM_ICDF(15809), AOM_ICDF(17144), AOM_ICDF(21700),
+ AOM_ICDF(22936), AOM_ICDF(28610), AOM_ICDF(29747), AOM_ICDF(32558),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10143), AOM_ICDF(11513), AOM_ICDF(15807), AOM_ICDF(17254),
- AOM_ICDF(17669), AOM_ICDF(18008), AOM_ICDF(18900), AOM_ICDF(22302),
- AOM_ICDF(23549), AOM_ICDF(27612), AOM_ICDF(28797), AOM_ICDF(31075),
+ { AOM_ICDF(10032), AOM_ICDF(11356), AOM_ICDF(16324), AOM_ICDF(17851),
+ AOM_ICDF(18191), AOM_ICDF(18525), AOM_ICDF(19241), AOM_ICDF(22933),
+ AOM_ICDF(24078), AOM_ICDF(27949), AOM_ICDF(29094), AOM_ICDF(31080),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(8833), AOM_ICDF(11761), AOM_ICDF(13049), AOM_ICDF(14664),
- AOM_ICDF(15350), AOM_ICDF(16625), AOM_ICDF(17296), AOM_ICDF(18763),
- AOM_ICDF(23965), AOM_ICDF(28910), AOM_ICDF(30651), AOM_ICDF(32276),
+ { { AOM_ICDF(11187), AOM_ICDF(13518), AOM_ICDF(14554), AOM_ICDF(16266),
+ AOM_ICDF(16753), AOM_ICDF(17679), AOM_ICDF(18282), AOM_ICDF(19923),
+ AOM_ICDF(24195), AOM_ICDF(29274), AOM_ICDF(30823), AOM_ICDF(32442),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7330), AOM_ICDF(14512), AOM_ICDF(15007), AOM_ICDF(16453),
- AOM_ICDF(16810), AOM_ICDF(17923), AOM_ICDF(18283), AOM_ICDF(18956),
- AOM_ICDF(26273), AOM_ICDF(29483), AOM_ICDF(31381), AOM_ICDF(32147),
+ { AOM_ICDF(7948), AOM_ICDF(15152), AOM_ICDF(15579), AOM_ICDF(16934),
+ AOM_ICDF(17200), AOM_ICDF(18121), AOM_ICDF(18405), AOM_ICDF(19130),
+ AOM_ICDF(26141), AOM_ICDF(29589), AOM_ICDF(31275), AOM_ICDF(32270),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7894), AOM_ICDF(9290), AOM_ICDF(16186), AOM_ICDF(17556),
- AOM_ICDF(17921), AOM_ICDF(18375), AOM_ICDF(19137), AOM_ICDF(21775),
- AOM_ICDF(24278), AOM_ICDF(28382), AOM_ICDF(29215), AOM_ICDF(31462),
+ { AOM_ICDF(8418), AOM_ICDF(9721), AOM_ICDF(16634), AOM_ICDF(18137),
+ AOM_ICDF(18405), AOM_ICDF(18791), AOM_ICDF(19607), AOM_ICDF(22197),
+ AOM_ICDF(24804), AOM_ICDF(28838), AOM_ICDF(29667), AOM_ICDF(31725),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8447), AOM_ICDF(9583), AOM_ICDF(10119), AOM_ICDF(16138),
- AOM_ICDF(16329), AOM_ICDF(16754), AOM_ICDF(17150), AOM_ICDF(20178),
- AOM_ICDF(25333), AOM_ICDF(29666), AOM_ICDF(30884), AOM_ICDF(32563),
+ { AOM_ICDF(9661), AOM_ICDF(10767), AOM_ICDF(11231), AOM_ICDF(16796),
+ AOM_ICDF(16918), AOM_ICDF(17285), AOM_ICDF(17685), AOM_ICDF(20433),
+ AOM_ICDF(25515), AOM_ICDF(29910), AOM_ICDF(31128), AOM_ICDF(32611),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6228), AOM_ICDF(8393), AOM_ICDF(8761), AOM_ICDF(10179),
- AOM_ICDF(15636), AOM_ICDF(18092), AOM_ICDF(19565), AOM_ICDF(20569),
- AOM_ICDF(25826), AOM_ICDF(30034), AOM_ICDF(31328), AOM_ICDF(32277),
+ { AOM_ICDF(7447), AOM_ICDF(9631), AOM_ICDF(10071), AOM_ICDF(11463),
+ AOM_ICDF(16405), AOM_ICDF(18681), AOM_ICDF(19977), AOM_ICDF(21135),
+ AOM_ICDF(25724), AOM_ICDF(30089), AOM_ICDF(31371), AOM_ICDF(32429),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6809), AOM_ICDF(10166), AOM_ICDF(10749), AOM_ICDF(12078),
- AOM_ICDF(13594), AOM_ICDF(19299), AOM_ICDF(19874), AOM_ICDF(20705),
- AOM_ICDF(27187), AOM_ICDF(30467), AOM_ICDF(31804), AOM_ICDF(32558),
+ { AOM_ICDF(7732), AOM_ICDF(11142), AOM_ICDF(11643), AOM_ICDF(13157),
+ AOM_ICDF(14285), AOM_ICDF(19050), AOM_ICDF(19568), AOM_ICDF(20445),
+ AOM_ICDF(26278), AOM_ICDF(30197), AOM_ICDF(31552), AOM_ICDF(32543),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7063), AOM_ICDF(8621), AOM_ICDF(10021), AOM_ICDF(11200),
- AOM_ICDF(13010), AOM_ICDF(14010), AOM_ICDF(17726), AOM_ICDF(19326),
- AOM_ICDF(23705), AOM_ICDF(28642), AOM_ICDF(29873), AOM_ICDF(32326),
+ { AOM_ICDF(8655), AOM_ICDF(9972), AOM_ICDF(11341), AOM_ICDF(12647),
+ AOM_ICDF(14152), AOM_ICDF(15009), AOM_ICDF(18424), AOM_ICDF(20317),
+ AOM_ICDF(23903), AOM_ICDF(29129), AOM_ICDF(30367), AOM_ICDF(32348),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7694), AOM_ICDF(9011), AOM_ICDF(10203), AOM_ICDF(13603),
- AOM_ICDF(14044), AOM_ICDF(14877), AOM_ICDF(15508), AOM_ICDF(20655),
- AOM_ICDF(24269), AOM_ICDF(29008), AOM_ICDF(30466), AOM_ICDF(32507),
+ { AOM_ICDF(8905), AOM_ICDF(10161), AOM_ICDF(11295), AOM_ICDF(14376),
+ AOM_ICDF(14751), AOM_ICDF(15334), AOM_ICDF(15861), AOM_ICDF(20676),
+ AOM_ICDF(24144), AOM_ICDF(29140), AOM_ICDF(30559), AOM_ICDF(32518),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6860), AOM_ICDF(9099), AOM_ICDF(9413), AOM_ICDF(11830),
- AOM_ICDF(12030), AOM_ICDF(12422), AOM_ICDF(12709), AOM_ICDF(13767),
- AOM_ICDF(27379), AOM_ICDF(30147), AOM_ICDF(31799), AOM_ICDF(32508),
+ { AOM_ICDF(7230), AOM_ICDF(9455), AOM_ICDF(9769), AOM_ICDF(12237),
+ AOM_ICDF(12385), AOM_ICDF(12718), AOM_ICDF(12941), AOM_ICDF(14070),
+ AOM_ICDF(26774), AOM_ICDF(30020), AOM_ICDF(31689), AOM_ICDF(32544),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8452), AOM_ICDF(10943), AOM_ICDF(11900), AOM_ICDF(13699),
- AOM_ICDF(14181), AOM_ICDF(15190), AOM_ICDF(15804), AOM_ICDF(17561),
- AOM_ICDF(22928), AOM_ICDF(28155), AOM_ICDF(30399), AOM_ICDF(32361),
+ { AOM_ICDF(9676), AOM_ICDF(11840), AOM_ICDF(12666), AOM_ICDF(14444),
+ AOM_ICDF(14854), AOM_ICDF(15790), AOM_ICDF(16395), AOM_ICDF(18289),
+ AOM_ICDF(23074), AOM_ICDF(28546), AOM_ICDF(30570), AOM_ICDF(32500),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8034), AOM_ICDF(11080), AOM_ICDF(12124), AOM_ICDF(13707),
- AOM_ICDF(14339), AOM_ICDF(15642), AOM_ICDF(16175), AOM_ICDF(17704),
- AOM_ICDF(23351), AOM_ICDF(28299), AOM_ICDF(30766), AOM_ICDF(32130),
+ { AOM_ICDF(8954), AOM_ICDF(11507), AOM_ICDF(12411), AOM_ICDF(14262),
+ AOM_ICDF(14736), AOM_ICDF(15800), AOM_ICDF(16324), AOM_ICDF(17931),
+ AOM_ICDF(23370), AOM_ICDF(28692), AOM_ICDF(30899), AOM_ICDF(32304),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8177), AOM_ICDF(10289), AOM_ICDF(11486), AOM_ICDF(13366),
- AOM_ICDF(13824), AOM_ICDF(14993), AOM_ICDF(15642), AOM_ICDF(18035),
- AOM_ICDF(22875), AOM_ICDF(28529), AOM_ICDF(30204), AOM_ICDF(32419),
+ { AOM_ICDF(9604), AOM_ICDF(11709), AOM_ICDF(12728), AOM_ICDF(14391),
+ AOM_ICDF(14817), AOM_ICDF(15784), AOM_ICDF(16426), AOM_ICDF(18627),
+ AOM_ICDF(22984), AOM_ICDF(28781), AOM_ICDF(30290), AOM_ICDF(32507),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7047), AOM_ICDF(11719), AOM_ICDF(14203), AOM_ICDF(15942),
- AOM_ICDF(16314), AOM_ICDF(16888), AOM_ICDF(17137), AOM_ICDF(18301),
- AOM_ICDF(24293), AOM_ICDF(27816), AOM_ICDF(29306), AOM_ICDF(30672),
+ { AOM_ICDF(8037), AOM_ICDF(12362), AOM_ICDF(14711), AOM_ICDF(16445),
+ AOM_ICDF(16662), AOM_ICDF(17238), AOM_ICDF(17667), AOM_ICDF(18883),
+ AOM_ICDF(24405), AOM_ICDF(27873), AOM_ICDF(29300), AOM_ICDF(30676),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(11539), AOM_ICDF(13095), AOM_ICDF(15455), AOM_ICDF(16258),
- AOM_ICDF(16962), AOM_ICDF(17852), AOM_ICDF(19067), AOM_ICDF(20977),
- AOM_ICDF(22373), AOM_ICDF(28049), AOM_ICDF(29702), AOM_ICDF(32261),
+ { { AOM_ICDF(12742), AOM_ICDF(13944), AOM_ICDF(16005), AOM_ICDF(16901),
+ AOM_ICDF(17483), AOM_ICDF(18249), AOM_ICDF(19462), AOM_ICDF(21457),
+ AOM_ICDF(22908), AOM_ICDF(28575), AOM_ICDF(30017), AOM_ICDF(32411),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10893), AOM_ICDF(16770), AOM_ICDF(17945), AOM_ICDF(18572),
- AOM_ICDF(19068), AOM_ICDF(20224), AOM_ICDF(20818), AOM_ICDF(21815),
- AOM_ICDF(23625), AOM_ICDF(28350), AOM_ICDF(30373), AOM_ICDF(31951),
+ { AOM_ICDF(11299), AOM_ICDF(16882), AOM_ICDF(17822), AOM_ICDF(18576),
+ AOM_ICDF(19025), AOM_ICDF(20145), AOM_ICDF(20676), AOM_ICDF(21738),
+ AOM_ICDF(23779), AOM_ICDF(28608), AOM_ICDF(30479), AOM_ICDF(32163),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8487), AOM_ICDF(9096), AOM_ICDF(19440), AOM_ICDF(19898),
- AOM_ICDF(20152), AOM_ICDF(20406), AOM_ICDF(21585), AOM_ICDF(23574),
- AOM_ICDF(24104), AOM_ICDF(28128), AOM_ICDF(28976), AOM_ICDF(31652),
+ { AOM_ICDF(9373), AOM_ICDF(9807), AOM_ICDF(20454), AOM_ICDF(20912),
+ AOM_ICDF(21134), AOM_ICDF(21315), AOM_ICDF(22536), AOM_ICDF(24523),
+ AOM_ICDF(25027), AOM_ICDF(28824), AOM_ICDF(29546), AOM_ICDF(31958),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9646), AOM_ICDF(10627), AOM_ICDF(11571), AOM_ICDF(14926),
- AOM_ICDF(15341), AOM_ICDF(15846), AOM_ICDF(16745), AOM_ICDF(20478),
- AOM_ICDF(22765), AOM_ICDF(28350), AOM_ICDF(30111), AOM_ICDF(32464),
+ { AOM_ICDF(10839), AOM_ICDF(11634), AOM_ICDF(12609), AOM_ICDF(15747),
+ AOM_ICDF(16076), AOM_ICDF(16521), AOM_ICDF(17368), AOM_ICDF(20813),
+ AOM_ICDF(23179), AOM_ICDF(28736), AOM_ICDF(30250), AOM_ICDF(32547),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8568), AOM_ICDF(9727), AOM_ICDF(10511), AOM_ICDF(11295),
- AOM_ICDF(18604), AOM_ICDF(21205), AOM_ICDF(23405), AOM_ICDF(24518),
- AOM_ICDF(25944), AOM_ICDF(29941), AOM_ICDF(31227), AOM_ICDF(32615),
+ { AOM_ICDF(10018), AOM_ICDF(11043), AOM_ICDF(11846), AOM_ICDF(12631),
+ AOM_ICDF(18703), AOM_ICDF(21106), AOM_ICDF(23223), AOM_ICDF(24327),
+ AOM_ICDF(25655), AOM_ICDF(29908), AOM_ICDF(31108), AOM_ICDF(32633),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9506), AOM_ICDF(11980), AOM_ICDF(12751), AOM_ICDF(13623),
- AOM_ICDF(15342), AOM_ICDF(20257), AOM_ICDF(21270), AOM_ICDF(22434),
- AOM_ICDF(24269), AOM_ICDF(29116), AOM_ICDF(30666), AOM_ICDF(32391),
+ { AOM_ICDF(10447), AOM_ICDF(12670), AOM_ICDF(13370), AOM_ICDF(14274),
+ AOM_ICDF(15751), AOM_ICDF(20138), AOM_ICDF(21082), AOM_ICDF(22289),
+ AOM_ICDF(24356), AOM_ICDF(29308), AOM_ICDF(30721), AOM_ICDF(32473),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9047), AOM_ICDF(9747), AOM_ICDF(12286), AOM_ICDF(12885),
- AOM_ICDF(14624), AOM_ICDF(15422), AOM_ICDF(20705), AOM_ICDF(22542),
- AOM_ICDF(23718), AOM_ICDF(28732), AOM_ICDF(29877), AOM_ICDF(32463),
+ { AOM_ICDF(10304), AOM_ICDF(10858), AOM_ICDF(13242), AOM_ICDF(13826),
+ AOM_ICDF(15409), AOM_ICDF(16080), AOM_ICDF(21225), AOM_ICDF(22983),
+ AOM_ICDF(23924), AOM_ICDF(29128), AOM_ICDF(30162), AOM_ICDF(32556),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8962), AOM_ICDF(9691), AOM_ICDF(12145), AOM_ICDF(13488),
- AOM_ICDF(13953), AOM_ICDF(14482), AOM_ICDF(15637), AOM_ICDF(21429),
- AOM_ICDF(22598), AOM_ICDF(28325), AOM_ICDF(29542), AOM_ICDF(32447),
+ { AOM_ICDF(9909), AOM_ICDF(10554), AOM_ICDF(12924), AOM_ICDF(14243),
+ AOM_ICDF(14636), AOM_ICDF(15075), AOM_ICDF(16202), AOM_ICDF(21806),
+ AOM_ICDF(23067), AOM_ICDF(28721), AOM_ICDF(29942), AOM_ICDF(32552),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9989), AOM_ICDF(11831), AOM_ICDF(12759), AOM_ICDF(14276),
- AOM_ICDF(14826), AOM_ICDF(15641), AOM_ICDF(16496), AOM_ICDF(18520),
- AOM_ICDF(22334), AOM_ICDF(28131), AOM_ICDF(30338), AOM_ICDF(32354),
+ { AOM_ICDF(10896), AOM_ICDF(12565), AOM_ICDF(13376), AOM_ICDF(14948),
+ AOM_ICDF(15378), AOM_ICDF(16154), AOM_ICDF(16898), AOM_ICDF(19033),
+ AOM_ICDF(22710), AOM_ICDF(28465), AOM_ICDF(30461), AOM_ICDF(32462),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10613), AOM_ICDF(11873), AOM_ICDF(13667), AOM_ICDF(14611),
- AOM_ICDF(15224), AOM_ICDF(16124), AOM_ICDF(17276), AOM_ICDF(19646),
- AOM_ICDF(21219), AOM_ICDF(27664), AOM_ICDF(29544), AOM_ICDF(32369),
+ { AOM_ICDF(11659), AOM_ICDF(12724), AOM_ICDF(14290), AOM_ICDF(15241),
+ AOM_ICDF(15795), AOM_ICDF(16545), AOM_ICDF(17729), AOM_ICDF(20065),
+ AOM_ICDF(21669), AOM_ICDF(28045), AOM_ICDF(29829), AOM_ICDF(32507),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10368), AOM_ICDF(12271), AOM_ICDF(14030), AOM_ICDF(14844),
- AOM_ICDF(15537), AOM_ICDF(16595), AOM_ICDF(17695), AOM_ICDF(19603),
- AOM_ICDF(21278), AOM_ICDF(27658), AOM_ICDF(29915), AOM_ICDF(32101),
+ { AOM_ICDF(11351), AOM_ICDF(12806), AOM_ICDF(14382), AOM_ICDF(15343),
+ AOM_ICDF(15955), AOM_ICDF(16885), AOM_ICDF(17916), AOM_ICDF(20033),
+ AOM_ICDF(21718), AOM_ICDF(28093), AOM_ICDF(30166), AOM_ICDF(32319),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10439), AOM_ICDF(11551), AOM_ICDF(13892), AOM_ICDF(14821),
- AOM_ICDF(15335), AOM_ICDF(16054), AOM_ICDF(17350), AOM_ICDF(19768),
- AOM_ICDF(21122), AOM_ICDF(27623), AOM_ICDF(29210), AOM_ICDF(32304),
+ { AOM_ICDF(11522), AOM_ICDF(12494), AOM_ICDF(14590), AOM_ICDF(15496),
+ AOM_ICDF(15977), AOM_ICDF(16665), AOM_ICDF(17908), AOM_ICDF(20267),
+ AOM_ICDF(21743), AOM_ICDF(28115), AOM_ICDF(29581), AOM_ICDF(32452),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9053), AOM_ICDF(11765), AOM_ICDF(16915), AOM_ICDF(17711),
- AOM_ICDF(18030), AOM_ICDF(18547), AOM_ICDF(19174), AOM_ICDF(20516),
- AOM_ICDF(21816), AOM_ICDF(26363), AOM_ICDF(27879), AOM_ICDF(29963),
+ { AOM_ICDF(9913), AOM_ICDF(12241), AOM_ICDF(17367), AOM_ICDF(18136),
+ AOM_ICDF(18433), AOM_ICDF(18985), AOM_ICDF(19700), AOM_ICDF(21136),
+ AOM_ICDF(22405), AOM_ICDF(26910), AOM_ICDF(28302), AOM_ICDF(30379),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(11858), AOM_ICDF(14391), AOM_ICDF(16650), AOM_ICDF(17312),
- AOM_ICDF(17872), AOM_ICDF(18845), AOM_ICDF(19900), AOM_ICDF(21516),
- AOM_ICDF(22947), AOM_ICDF(28420), AOM_ICDF(30257), AOM_ICDF(32222),
+ { { AOM_ICDF(12772), AOM_ICDF(14653), AOM_ICDF(16651), AOM_ICDF(17429),
+ AOM_ICDF(17957), AOM_ICDF(18854), AOM_ICDF(19886), AOM_ICDF(21672),
+ AOM_ICDF(23234), AOM_ICDF(28792), AOM_ICDF(30500), AOM_ICDF(32399),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10662), AOM_ICDF(18408), AOM_ICDF(19170), AOM_ICDF(19654),
- AOM_ICDF(19981), AOM_ICDF(20952), AOM_ICDF(21470), AOM_ICDF(22348),
- AOM_ICDF(24081), AOM_ICDF(28270), AOM_ICDF(30714), AOM_ICDF(31864),
+ { AOM_ICDF(10718), AOM_ICDF(18074), AOM_ICDF(18913), AOM_ICDF(19509),
+ AOM_ICDF(19880), AOM_ICDF(20951), AOM_ICDF(21443), AOM_ICDF(22467),
+ AOM_ICDF(24411), AOM_ICDF(28546), AOM_ICDF(30812), AOM_ICDF(32079),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8063), AOM_ICDF(8929), AOM_ICDF(20183), AOM_ICDF(20557),
- AOM_ICDF(20896), AOM_ICDF(21250), AOM_ICDF(22341), AOM_ICDF(24035),
- AOM_ICDF(24691), AOM_ICDF(28658), AOM_ICDF(29663), AOM_ICDF(31629),
+ { AOM_ICDF(8668), AOM_ICDF(9307), AOM_ICDF(20783), AOM_ICDF(21169),
+ AOM_ICDF(21531), AOM_ICDF(21743), AOM_ICDF(22862), AOM_ICDF(24771),
+ AOM_ICDF(25364), AOM_ICDF(29059), AOM_ICDF(29920), AOM_ICDF(31878),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10769), AOM_ICDF(12122), AOM_ICDF(13186), AOM_ICDF(16299),
- AOM_ICDF(16693), AOM_ICDF(17323), AOM_ICDF(17953), AOM_ICDF(21486),
- AOM_ICDF(23745), AOM_ICDF(29222), AOM_ICDF(30811), AOM_ICDF(32532),
+ { AOM_ICDF(11352), AOM_ICDF(12585), AOM_ICDF(13504), AOM_ICDF(16428),
+ AOM_ICDF(16801), AOM_ICDF(17365), AOM_ICDF(17969), AOM_ICDF(21427),
+ AOM_ICDF(23868), AOM_ICDF(29321), AOM_ICDF(30836), AOM_ICDF(32622),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8262), AOM_ICDF(10261), AOM_ICDF(11305), AOM_ICDF(12158),
- AOM_ICDF(18268), AOM_ICDF(20814), AOM_ICDF(23157), AOM_ICDF(24315),
- AOM_ICDF(26021), AOM_ICDF(29942), AOM_ICDF(31470), AOM_ICDF(32590),
+ { AOM_ICDF(9076), AOM_ICDF(10636), AOM_ICDF(11637), AOM_ICDF(12524),
+ AOM_ICDF(18204), AOM_ICDF(20593), AOM_ICDF(22842), AOM_ICDF(23921),
+ AOM_ICDF(25465), AOM_ICDF(29951), AOM_ICDF(31401), AOM_ICDF(32575),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8964), AOM_ICDF(12016), AOM_ICDF(12757), AOM_ICDF(13584),
- AOM_ICDF(15277), AOM_ICDF(20638), AOM_ICDF(21456), AOM_ICDF(22454),
- AOM_ICDF(24612), AOM_ICDF(29051), AOM_ICDF(30905), AOM_ICDF(32502),
+ { AOM_ICDF(9924), AOM_ICDF(12861), AOM_ICDF(13519), AOM_ICDF(14327),
+ AOM_ICDF(15700), AOM_ICDF(20596), AOM_ICDF(21434), AOM_ICDF(22592),
+ AOM_ICDF(24521), AOM_ICDF(29177), AOM_ICDF(30937), AOM_ICDF(32569),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9051), AOM_ICDF(10365), AOM_ICDF(12405), AOM_ICDF(12889),
- AOM_ICDF(14465), AOM_ICDF(15391), AOM_ICDF(21194), AOM_ICDF(22991),
- AOM_ICDF(24263), AOM_ICDF(28983), AOM_ICDF(30224), AOM_ICDF(32432),
+ { AOM_ICDF(9975), AOM_ICDF(10926), AOM_ICDF(13127), AOM_ICDF(13658),
+ AOM_ICDF(15283), AOM_ICDF(16041), AOM_ICDF(21277), AOM_ICDF(23058),
+ AOM_ICDF(24139), AOM_ICDF(29093), AOM_ICDF(30305), AOM_ICDF(32527),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9084), AOM_ICDF(10343), AOM_ICDF(12743), AOM_ICDF(14152),
- AOM_ICDF(14576), AOM_ICDF(15374), AOM_ICDF(16421), AOM_ICDF(22076),
- AOM_ICDF(23572), AOM_ICDF(29015), AOM_ICDF(30337), AOM_ICDF(32544),
+ { AOM_ICDF(9782), AOM_ICDF(10733), AOM_ICDF(12976), AOM_ICDF(14251),
+ AOM_ICDF(14721), AOM_ICDF(15295), AOM_ICDF(16279), AOM_ICDF(22181),
+ AOM_ICDF(23520), AOM_ICDF(29134), AOM_ICDF(30459), AOM_ICDF(32591),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10145), AOM_ICDF(12471), AOM_ICDF(13286), AOM_ICDF(14641),
- AOM_ICDF(15410), AOM_ICDF(16465), AOM_ICDF(17104), AOM_ICDF(18850),
- AOM_ICDF(22988), AOM_ICDF(28402), AOM_ICDF(30950), AOM_ICDF(32449),
+ { AOM_ICDF(10910), AOM_ICDF(13136), AOM_ICDF(13939), AOM_ICDF(15246),
+ AOM_ICDF(15760), AOM_ICDF(16621), AOM_ICDF(17278), AOM_ICDF(19097),
+ AOM_ICDF(23321), AOM_ICDF(28756), AOM_ICDF(31030), AOM_ICDF(32520),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10527), AOM_ICDF(12542), AOM_ICDF(14343), AOM_ICDF(15157),
- AOM_ICDF(15744), AOM_ICDF(16691), AOM_ICDF(17702), AOM_ICDF(19718),
- AOM_ICDF(21489), AOM_ICDF(27717), AOM_ICDF(29885), AOM_ICDF(32307),
+ { AOM_ICDF(11508), AOM_ICDF(13079), AOM_ICDF(14662), AOM_ICDF(15543),
+ AOM_ICDF(16088), AOM_ICDF(16964), AOM_ICDF(18013), AOM_ICDF(20126),
+ AOM_ICDF(21886), AOM_ICDF(28317), AOM_ICDF(30284), AOM_ICDF(32446),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10498), AOM_ICDF(13555), AOM_ICDF(15345), AOM_ICDF(16157),
- AOM_ICDF(16744), AOM_ICDF(18017), AOM_ICDF(18780), AOM_ICDF(20381),
- AOM_ICDF(22151), AOM_ICDF(28145), AOM_ICDF(30390), AOM_ICDF(32222),
+ { AOM_ICDF(11588), AOM_ICDF(13894), AOM_ICDF(15463), AOM_ICDF(16360),
+ AOM_ICDF(16934), AOM_ICDF(17975), AOM_ICDF(18878), AOM_ICDF(20699),
+ AOM_ICDF(22408), AOM_ICDF(28392), AOM_ICDF(30519), AOM_ICDF(32360),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9932), AOM_ICDF(11718), AOM_ICDF(14141), AOM_ICDF(15068),
- AOM_ICDF(15769), AOM_ICDF(16715), AOM_ICDF(18003), AOM_ICDF(19965),
- AOM_ICDF(21637), AOM_ICDF(28004), AOM_ICDF(29676), AOM_ICDF(32301),
+ { AOM_ICDF(11198), AOM_ICDF(12680), AOM_ICDF(14726), AOM_ICDF(15620),
+ AOM_ICDF(16098), AOM_ICDF(16861), AOM_ICDF(18056), AOM_ICDF(20172),
+ AOM_ICDF(21896), AOM_ICDF(28252), AOM_ICDF(29839), AOM_ICDF(32437),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9240), AOM_ICDF(13034), AOM_ICDF(17559), AOM_ICDF(18257),
- AOM_ICDF(18607), AOM_ICDF(19305), AOM_ICDF(19845), AOM_ICDF(21194),
- AOM_ICDF(22496), AOM_ICDF(27370), AOM_ICDF(29180), AOM_ICDF(30418),
+ { AOM_ICDF(9832), AOM_ICDF(13268), AOM_ICDF(17993), AOM_ICDF(18757),
+ AOM_ICDF(19173), AOM_ICDF(19664), AOM_ICDF(20264), AOM_ICDF(21689),
+ AOM_ICDF(23011), AOM_ICDF(27552), AOM_ICDF(29216), AOM_ICDF(30566),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(11303), AOM_ICDF(12649), AOM_ICDF(15875), AOM_ICDF(16646),
- AOM_ICDF(17179), AOM_ICDF(17809), AOM_ICDF(19191), AOM_ICDF(21141),
- AOM_ICDF(22344), AOM_ICDF(27773), AOM_ICDF(29078), AOM_ICDF(32149),
+ { { AOM_ICDF(12350), AOM_ICDF(13494), AOM_ICDF(16423), AOM_ICDF(17219),
+ AOM_ICDF(17721), AOM_ICDF(18280), AOM_ICDF(19569), AOM_ICDF(21557),
+ AOM_ICDF(22752), AOM_ICDF(28182), AOM_ICDF(29360), AOM_ICDF(32304),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9575), AOM_ICDF(15618), AOM_ICDF(16798), AOM_ICDF(17411),
- AOM_ICDF(17924), AOM_ICDF(18893), AOM_ICDF(19596), AOM_ICDF(20742),
- AOM_ICDF(22450), AOM_ICDF(27202), AOM_ICDF(28930), AOM_ICDF(31316),
+ { AOM_ICDF(10022), AOM_ICDF(16315), AOM_ICDF(17409), AOM_ICDF(18094),
+ AOM_ICDF(18533), AOM_ICDF(19487), AOM_ICDF(20138), AOM_ICDF(21179),
+ AOM_ICDF(22977), AOM_ICDF(27630), AOM_ICDF(29129), AOM_ICDF(31612),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8202), AOM_ICDF(8681), AOM_ICDF(20005), AOM_ICDF(20377),
- AOM_ICDF(20575), AOM_ICDF(20785), AOM_ICDF(21882), AOM_ICDF(24048),
- AOM_ICDF(24475), AOM_ICDF(27806), AOM_ICDF(28288), AOM_ICDF(31706),
+ { AOM_ICDF(9089), AOM_ICDF(9522), AOM_ICDF(20772), AOM_ICDF(21117),
+ AOM_ICDF(21321), AOM_ICDF(21492), AOM_ICDF(22623), AOM_ICDF(24717),
+ AOM_ICDF(25118), AOM_ICDF(28517), AOM_ICDF(28979), AOM_ICDF(31962),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9012), AOM_ICDF(9615), AOM_ICDF(10923), AOM_ICDF(14928),
- AOM_ICDF(15326), AOM_ICDF(15756), AOM_ICDF(16655), AOM_ICDF(21099),
- AOM_ICDF(23225), AOM_ICDF(28272), AOM_ICDF(29907), AOM_ICDF(32492),
+ { AOM_ICDF(9995), AOM_ICDF(10496), AOM_ICDF(11749), AOM_ICDF(15264),
+ AOM_ICDF(15578), AOM_ICDF(15986), AOM_ICDF(16825), AOM_ICDF(20949),
+ AOM_ICDF(23073), AOM_ICDF(28353), AOM_ICDF(29869), AOM_ICDF(32482),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8574), AOM_ICDF(9796), AOM_ICDF(10891), AOM_ICDF(11829),
- AOM_ICDF(18464), AOM_ICDF(20476), AOM_ICDF(22783), AOM_ICDF(24194),
- AOM_ICDF(25490), AOM_ICDF(29924), AOM_ICDF(31209), AOM_ICDF(32557),
+ { AOM_ICDF(9679), AOM_ICDF(10801), AOM_ICDF(11768), AOM_ICDF(12705),
+ AOM_ICDF(18527), AOM_ICDF(20477), AOM_ICDF(22915), AOM_ICDF(24165),
+ AOM_ICDF(25268), AOM_ICDF(29848), AOM_ICDF(30931), AOM_ICDF(32576),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8796), AOM_ICDF(11174), AOM_ICDF(12299), AOM_ICDF(13434),
- AOM_ICDF(15019), AOM_ICDF(19393), AOM_ICDF(20430), AOM_ICDF(21790),
- AOM_ICDF(23982), AOM_ICDF(29197), AOM_ICDF(30312), AOM_ICDF(32406),
+ { AOM_ICDF(9567), AOM_ICDF(11899), AOM_ICDF(12955), AOM_ICDF(13828),
+ AOM_ICDF(15192), AOM_ICDF(19318), AOM_ICDF(20367), AOM_ICDF(21537),
+ AOM_ICDF(23628), AOM_ICDF(28952), AOM_ICDF(30125), AOM_ICDF(32358),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8938), AOM_ICDF(9485), AOM_ICDF(12349), AOM_ICDF(12989),
- AOM_ICDF(14545), AOM_ICDF(15099), AOM_ICDF(20457), AOM_ICDF(22621),
- AOM_ICDF(23348), AOM_ICDF(28532), AOM_ICDF(29351), AOM_ICDF(32421),
+ { AOM_ICDF(9977), AOM_ICDF(10470), AOM_ICDF(13391), AOM_ICDF(14019),
+ AOM_ICDF(15325), AOM_ICDF(15830), AOM_ICDF(21218), AOM_ICDF(23133),
+ AOM_ICDF(23836), AOM_ICDF(28927), AOM_ICDF(29755), AOM_ICDF(32513),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8979), AOM_ICDF(9548), AOM_ICDF(12433), AOM_ICDF(13934),
- AOM_ICDF(14309), AOM_ICDF(14715), AOM_ICDF(15987), AOM_ICDF(21989),
- AOM_ICDF(22988), AOM_ICDF(28294), AOM_ICDF(29310), AOM_ICDF(32325),
+ { AOM_ICDF(9850), AOM_ICDF(10345), AOM_ICDF(13290), AOM_ICDF(14602),
+ AOM_ICDF(14927), AOM_ICDF(15251), AOM_ICDF(16355), AOM_ICDF(22136),
+ AOM_ICDF(23237), AOM_ICDF(28655), AOM_ICDF(29584), AOM_ICDF(32430),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9664), AOM_ICDF(11124), AOM_ICDF(12255), AOM_ICDF(13749),
- AOM_ICDF(14304), AOM_ICDF(15113), AOM_ICDF(16065), AOM_ICDF(18457),
- AOM_ICDF(21843), AOM_ICDF(27717), AOM_ICDF(29917), AOM_ICDF(32247),
+ { AOM_ICDF(10404), AOM_ICDF(11783), AOM_ICDF(12735), AOM_ICDF(14400),
+ AOM_ICDF(14849), AOM_ICDF(15513), AOM_ICDF(16394), AOM_ICDF(18648),
+ AOM_ICDF(22370), AOM_ICDF(28254), AOM_ICDF(30174), AOM_ICDF(32416),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10407), AOM_ICDF(11374), AOM_ICDF(13683), AOM_ICDF(14670),
- AOM_ICDF(15224), AOM_ICDF(15897), AOM_ICDF(17206), AOM_ICDF(19776),
- AOM_ICDF(21083), AOM_ICDF(27287), AOM_ICDF(29035), AOM_ICDF(32222),
+ { AOM_ICDF(11468), AOM_ICDF(12380), AOM_ICDF(14466), AOM_ICDF(15450),
+ AOM_ICDF(15969), AOM_ICDF(16598), AOM_ICDF(17836), AOM_ICDF(20272),
+ AOM_ICDF(21618), AOM_ICDF(27769), AOM_ICDF(29346), AOM_ICDF(32367),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9649), AOM_ICDF(11381), AOM_ICDF(13557), AOM_ICDF(14522),
- AOM_ICDF(15111), AOM_ICDF(15852), AOM_ICDF(16969), AOM_ICDF(19211),
- AOM_ICDF(20692), AOM_ICDF(27411), AOM_ICDF(29342), AOM_ICDF(31862),
+ { AOM_ICDF(10553), AOM_ICDF(11978), AOM_ICDF(13832), AOM_ICDF(14829),
+ AOM_ICDF(15388), AOM_ICDF(16214), AOM_ICDF(17380), AOM_ICDF(19633),
+ AOM_ICDF(21295), AOM_ICDF(27909), AOM_ICDF(29723), AOM_ICDF(32101),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10300), AOM_ICDF(11260), AOM_ICDF(14478), AOM_ICDF(15295),
- AOM_ICDF(15700), AOM_ICDF(16095), AOM_ICDF(17514), AOM_ICDF(20117),
- AOM_ICDF(21035), AOM_ICDF(27446), AOM_ICDF(28862), AOM_ICDF(32373),
+ { AOM_ICDF(11458), AOM_ICDF(12316), AOM_ICDF(15258), AOM_ICDF(16119),
+ AOM_ICDF(16504), AOM_ICDF(16926), AOM_ICDF(18261), AOM_ICDF(20678),
+ AOM_ICDF(21757), AOM_ICDF(27964), AOM_ICDF(29206), AOM_ICDF(32426),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9095), AOM_ICDF(11736), AOM_ICDF(17183), AOM_ICDF(17693),
- AOM_ICDF(17953), AOM_ICDF(18308), AOM_ICDF(19149), AOM_ICDF(20582),
- AOM_ICDF(21766), AOM_ICDF(25757), AOM_ICDF(26847), AOM_ICDF(29227),
+ { AOM_ICDF(9827), AOM_ICDF(12420), AOM_ICDF(17601), AOM_ICDF(18357),
+ AOM_ICDF(18643), AOM_ICDF(19019), AOM_ICDF(19747), AOM_ICDF(21072),
+ AOM_ICDF(22058), AOM_ICDF(25919), AOM_ICDF(27042), AOM_ICDF(29550),
AOM_ICDF(32768), 0 } },
- { { AOM_ICDF(10085), AOM_ICDF(14580), AOM_ICDF(17195), AOM_ICDF(17500),
- AOM_ICDF(17796), AOM_ICDF(18346), AOM_ICDF(18830), AOM_ICDF(19862),
- AOM_ICDF(20560), AOM_ICDF(23168), AOM_ICDF(24344), AOM_ICDF(25660),
+ { { AOM_ICDF(9582), AOM_ICDF(13804), AOM_ICDF(16310), AOM_ICDF(16612),
+ AOM_ICDF(16855), AOM_ICDF(17317), AOM_ICDF(17804), AOM_ICDF(18740),
+ AOM_ICDF(19414), AOM_ICDF(21959), AOM_ICDF(22938), AOM_ICDF(24178),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8146), AOM_ICDF(20388), AOM_ICDF(21698), AOM_ICDF(21961),
- AOM_ICDF(22135), AOM_ICDF(22497), AOM_ICDF(22699), AOM_ICDF(23255),
- AOM_ICDF(23899), AOM_ICDF(25801), AOM_ICDF(27041), AOM_ICDF(27748),
+ { AOM_ICDF(7931), AOM_ICDF(20318), AOM_ICDF(21429), AOM_ICDF(21817),
+ AOM_ICDF(21997), AOM_ICDF(22345), AOM_ICDF(22526), AOM_ICDF(23105),
+ AOM_ICDF(23829), AOM_ICDF(25586), AOM_ICDF(26598), AOM_ICDF(27385),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6327), AOM_ICDF(7877), AOM_ICDF(22563), AOM_ICDF(22745),
- AOM_ICDF(22856), AOM_ICDF(22999), AOM_ICDF(23409), AOM_ICDF(24670),
- AOM_ICDF(24984), AOM_ICDF(26698), AOM_ICDF(27191), AOM_ICDF(28919),
+ { AOM_ICDF(6461), AOM_ICDF(7883), AOM_ICDF(22735), AOM_ICDF(22941),
+ AOM_ICDF(23061), AOM_ICDF(23170), AOM_ICDF(23671), AOM_ICDF(24830),
+ AOM_ICDF(25109), AOM_ICDF(26711), AOM_ICDF(27168), AOM_ICDF(28668),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10350), AOM_ICDF(12596), AOM_ICDF(15239), AOM_ICDF(18366),
- AOM_ICDF(18542), AOM_ICDF(18938), AOM_ICDF(19379), AOM_ICDF(22770),
- AOM_ICDF(24180), AOM_ICDF(29156), AOM_ICDF(30610), AOM_ICDF(31447),
+ { AOM_ICDF(9870), AOM_ICDF(12532), AOM_ICDF(14896), AOM_ICDF(17822),
+ AOM_ICDF(18219), AOM_ICDF(18649), AOM_ICDF(19079), AOM_ICDF(23162),
+ AOM_ICDF(24634), AOM_ICDF(28800), AOM_ICDF(30057), AOM_ICDF(31098),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(7329), AOM_ICDF(12674), AOM_ICDF(14384), AOM_ICDF(15056),
- AOM_ICDF(20919), AOM_ICDF(22507), AOM_ICDF(24034), AOM_ICDF(24858),
- AOM_ICDF(26569), AOM_ICDF(29287), AOM_ICDF(30203), AOM_ICDF(31211),
+ { AOM_ICDF(8170), AOM_ICDF(13942), AOM_ICDF(15674), AOM_ICDF(16236),
+ AOM_ICDF(20928), AOM_ICDF(22526), AOM_ICDF(24154), AOM_ICDF(25027),
+ AOM_ICDF(26567), AOM_ICDF(29246), AOM_ICDF(29882), AOM_ICDF(31110),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9435), AOM_ICDF(16091), AOM_ICDF(17506), AOM_ICDF(18188),
- AOM_ICDF(19602), AOM_ICDF(23966), AOM_ICDF(24478), AOM_ICDF(25722),
- AOM_ICDF(27063), AOM_ICDF(29745), AOM_ICDF(30744), AOM_ICDF(31378),
+ { AOM_ICDF(9833), AOM_ICDF(16669), AOM_ICDF(17894), AOM_ICDF(18429),
+ AOM_ICDF(19535), AOM_ICDF(23506), AOM_ICDF(24053), AOM_ICDF(25052),
+ AOM_ICDF(26466), AOM_ICDF(29379), AOM_ICDF(30616), AOM_ICDF(31424),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8827), AOM_ICDF(12404), AOM_ICDF(15707), AOM_ICDF(15939),
- AOM_ICDF(17442), AOM_ICDF(18077), AOM_ICDF(21888), AOM_ICDF(23856),
- AOM_ICDF(24640), AOM_ICDF(28386), AOM_ICDF(29360), AOM_ICDF(31519),
+ { AOM_ICDF(9558), AOM_ICDF(13127), AOM_ICDF(16722), AOM_ICDF(16945),
+ AOM_ICDF(18404), AOM_ICDF(18965), AOM_ICDF(23157), AOM_ICDF(24785),
+ AOM_ICDF(25444), AOM_ICDF(28879), AOM_ICDF(29715), AOM_ICDF(31451),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8362), AOM_ICDF(10713), AOM_ICDF(15315), AOM_ICDF(16321),
- AOM_ICDF(16774), AOM_ICDF(17076), AOM_ICDF(18006), AOM_ICDF(24029),
- AOM_ICDF(24557), AOM_ICDF(28002), AOM_ICDF(28958), AOM_ICDF(31083),
+ { AOM_ICDF(8656), AOM_ICDF(11218), AOM_ICDF(15859), AOM_ICDF(16851),
+ AOM_ICDF(17205), AOM_ICDF(17565), AOM_ICDF(18231), AOM_ICDF(24622),
+ AOM_ICDF(25273), AOM_ICDF(28496), AOM_ICDF(29332), AOM_ICDF(31266),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9727), AOM_ICDF(13584), AOM_ICDF(15223), AOM_ICDF(16260),
- AOM_ICDF(16633), AOM_ICDF(17628), AOM_ICDF(18499), AOM_ICDF(20117),
- AOM_ICDF(23726), AOM_ICDF(28081), AOM_ICDF(29844), AOM_ICDF(31192),
+ { AOM_ICDF(9768), AOM_ICDF(14291), AOM_ICDF(15838), AOM_ICDF(16981),
+ AOM_ICDF(17225), AOM_ICDF(18107), AOM_ICDF(18654), AOM_ICDF(20335),
+ AOM_ICDF(24118), AOM_ICDF(28540), AOM_ICDF(30170), AOM_ICDF(31448),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(9477), AOM_ICDF(14165), AOM_ICDF(17106), AOM_ICDF(17550),
- AOM_ICDF(18053), AOM_ICDF(18743), AOM_ICDF(19351), AOM_ICDF(20894),
- AOM_ICDF(21970), AOM_ICDF(26518), AOM_ICDF(28068), AOM_ICDF(30225),
+ { AOM_ICDF(10347), AOM_ICDF(15055), AOM_ICDF(17791), AOM_ICDF(18218),
+ AOM_ICDF(18600), AOM_ICDF(19290), AOM_ICDF(19932), AOM_ICDF(21554),
+ AOM_ICDF(22592), AOM_ICDF(26896), AOM_ICDF(28359), AOM_ICDF(30358),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(8434), AOM_ICDF(13435), AOM_ICDF(16612), AOM_ICDF(16925),
- AOM_ICDF(17396), AOM_ICDF(18165), AOM_ICDF(18777), AOM_ICDF(20188),
- AOM_ICDF(21413), AOM_ICDF(25402), AOM_ICDF(28152), AOM_ICDF(29605),
+ { AOM_ICDF(9093), AOM_ICDF(14028), AOM_ICDF(17143), AOM_ICDF(17521),
+ AOM_ICDF(17893), AOM_ICDF(18675), AOM_ICDF(19203), AOM_ICDF(20715),
+ AOM_ICDF(21674), AOM_ICDF(25422), AOM_ICDF(28036), AOM_ICDF(29528),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(10320), AOM_ICDF(14455), AOM_ICDF(18464), AOM_ICDF(18856),
- AOM_ICDF(19160), AOM_ICDF(19615), AOM_ICDF(20361), AOM_ICDF(22322),
- AOM_ICDF(23194), AOM_ICDF(27001), AOM_ICDF(28278), AOM_ICDF(30567),
+ { AOM_ICDF(10719), AOM_ICDF(15009), AOM_ICDF(18593), AOM_ICDF(19033),
+ AOM_ICDF(19256), AOM_ICDF(19708), AOM_ICDF(20387), AOM_ICDF(22033),
+ AOM_ICDF(22877), AOM_ICDF(26524), AOM_ICDF(27841), AOM_ICDF(30214),
AOM_ICDF(32768), 0 },
- { AOM_ICDF(6958), AOM_ICDF(10404), AOM_ICDF(14086), AOM_ICDF(14401),
- AOM_ICDF(14546), AOM_ICDF(14695), AOM_ICDF(14909), AOM_ICDF(15930),
- AOM_ICDF(16411), AOM_ICDF(17998), AOM_ICDF(18901), AOM_ICDF(19793),
+ { AOM_ICDF(6775), AOM_ICDF(10524), AOM_ICDF(14225), AOM_ICDF(14551),
+ AOM_ICDF(14761), AOM_ICDF(14914), AOM_ICDF(15132), AOM_ICDF(16033),
+ AOM_ICDF(16477), AOM_ICDF(17963), AOM_ICDF(18795), AOM_ICDF(19673),
AOM_ICDF(32768), 0 } }
#else
{
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 5e2e815..9bfc26a 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -616,12 +616,8 @@
FILTER_DC_PRED,
FILTER_V_PRED,
FILTER_H_PRED,
- FILTER_D45_PRED,
- FILTER_D135_PRED,
FILTER_D117_PRED,
FILTER_D153_PRED,
- FILTER_D207_PRED,
- FILTER_D63_PRED,
FILTER_PAETH_PRED,
FILTER_INTRA_MODES,
} FILTER_INTRA_MODE;
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 8523c2d..87870e0 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1072,61 +1072,41 @@
{ 697, 836, -509 },
{ 993, 513, -482 },
{ 381, 984, -341 },
- { 642, 1169, -787 },
- { 590, 553, -119 },
{ 762, 385, -123 },
{ 358, 687, -21 },
- { 411, 1083, -470 },
- { 912, 814, -702 },
{ 883, 902, -761 },
},
{
{ 659, 816, -451 },
{ 980, 625, -581 },
{ 558, 962, -496 },
- { 681, 888, -545 },
- { 591, 613, 180 },
{ 778, 399, -153 },
{ 495, 641, -112 },
- { 671, 937, -584 },
- { 745, 940, -661 },
{ 839, 911, -726 },
},
{
{ 539, 927, -442 },
{ 1003, 714, -693 },
{ 349, 1271, -596 },
- { 820, 764, -560 },
- { 524, 816, -316 },
{ 780, 681, -437 },
{ 586, 795, -357 },
- { 551, 1135, -663 },
- { 593, 1061, -630 },
{ 974, 970, -920 },
},
{
{ 595, 919, -490 },
- { 945, 668, -579 },
+ { 945, 668, -589 },
{ 495, 962, -433 },
- { 385, 1551, -912 },
- { 455, 554, 15 },
{ 852, 478, -306 },
- { 177, 760, -87 },
- { -65, 1611, -522 },
- { 815, 894, -685 },
+ { 177, 760, 87 },
{ 846, 1010, -832 },
},
#if CONFIG_TX64X64
{
{ 595, 919, -490 },
- { 945, 668, -579 },
+ { 945, 668, -589 },
{ 495, 962, -433 },
- { 385, 1551, -912 },
- { 455, 554, 15 },
{ 852, 478, -306 },
- { 177, 760, -87 },
- { -65, 1611, -522 },
- { 815, 894, -685 },
+ { 177, 760, 87 },
{ 846, 1010, -832 },
},
#endif // CONFIG_TX64X64
@@ -1134,120 +1114,80 @@
{ 697, 836, -509 },
{ 993, 513, -482 },
{ 381, 984, -341 },
- { 642, 1169, -787 },
- { 590, 553, -119 },
{ 762, 385, -123 },
{ 358, 687, -21 },
- { 411, 1083, -470 },
- { 912, 814, -702 },
{ 883, 902, -761 },
},
{
{ 697, 836, -509 },
{ 993, 513, -482 },
{ 381, 984, -341 },
- { 642, 1169, -787 },
- { 590, 553, -119 },
{ 762, 385, -123 },
{ 358, 687, -21 },
- { 411, 1083, -470 },
- { 912, 814, -702 },
{ 883, 902, -761 },
},
{
{ 659, 816, -451 },
{ 980, 625, -581 },
{ 558, 962, -496 },
- { 681, 888, -545 },
- { 591, 613, 180 },
{ 778, 399, -153 },
{ 495, 641, -112 },
- { 671, 937, -584 },
- { 745, 940, -661 },
{ 839, 911, -726 },
},
{
{ 659, 816, -451 },
{ 980, 625, -581 },
{ 558, 962, -496 },
- { 681, 888, -545 },
- { 591, 613, 180 },
{ 778, 399, -153 },
{ 495, 641, -112 },
- { 671, 937, -584 },
- { 745, 940, -661 },
{ 839, 911, -726 },
},
{
{ 539, 927, -442 },
{ 1003, 714, -693 },
{ 349, 1271, -596 },
- { 820, 764, -560 },
- { 524, 816, -316 },
{ 780, 681, -437 },
{ 586, 795, -357 },
- { 551, 1135, -663 },
- { 593, 1061, -630 },
{ 974, 970, -920 },
},
{
{ 539, 927, -442 },
{ 1003, 714, -693 },
{ 349, 1271, -596 },
- { 820, 764, -560 },
- { 524, 816, -316 },
{ 780, 681, -437 },
{ 586, 795, -357 },
- { 551, 1135, -663 },
- { 593, 1061, -630 },
{ 974, 970, -920 },
},
{
{ 697, 836, -509 },
{ 993, 513, -482 },
{ 381, 984, -341 },
- { 642, 1169, -787 },
- { 590, 553, -119 },
{ 762, 385, -123 },
{ 358, 687, -21 },
- { 411, 1083, -470 },
- { 912, 814, -702 },
{ 883, 902, -761 },
},
{
{ 697, 836, -509 },
{ 993, 513, -482 },
{ 381, 984, -341 },
- { 642, 1169, -787 },
- { 590, 553, -119 },
{ 762, 385, -123 },
{ 358, 687, -21 },
- { 411, 1083, -470 },
- { 912, 814, -702 },
{ 883, 902, -761 },
},
{
{ 659, 816, -451 },
{ 980, 625, -581 },
{ 558, 962, -496 },
- { 681, 888, -545 },
- { 591, 613, 180 },
{ 778, 399, -153 },
{ 495, 641, -112 },
- { 671, 937, -584 },
- { 745, 940, -661 },
{ 839, 911, -726 },
},
{
{ 659, 816, -451 },
{ 980, 625, -581 },
{ 558, 962, -496 },
- { 681, 888, -545 },
- { 591, 613, 180 },
{ 778, 399, -153 },
{ 495, 641, -112 },
- { 671, 937, -584 },
- { 745, 940, -661 },
{ 839, 911, -726 },
}
};
@@ -1443,7 +1383,7 @@
TX_SIZE tx_size, const uint8_t *above,
const uint8_t *left, int mode) {
int r, c;
- int mean, ipred;
+ int ipred;
#if CONFIG_TX64X64
int buffer[65][65];
#else
@@ -1455,30 +1395,21 @@
const int bw = tx_size_wide[tx_size];
const int bh = tx_size_high[tx_size];
- mean = 0;
- for (r = 0; r < bh; ++r) {
- mean += (int)left[r];
- }
- for (c = 0; c < bw; ++c) {
- mean += (int)above[c];
- }
- mean = (mean + ((bw + bh) >> 1)) / (bw + bh);
+ for (r = 0; r < bh; ++r) buffer[r + 1][0] = (int)left[r];
- for (r = 0; r < bh; ++r) buffer[r + 1][0] = (int)left[r] - mean;
-
- for (c = 0; c < bw + 1; ++c) buffer[0][c] = (int)above[c - 1] - mean;
+ for (c = 0; c < bw + 1; ++c) buffer[0][c] = (int)above[c - 1];
for (r = 1; r < bh + 1; ++r)
for (c = 1; c < bw + 1; ++c) {
ipred = c0 * buffer[r - 1][c] + c1 * buffer[r][c - 1] +
c2 * buffer[r - 1][c - 1];
buffer[r][c] = ROUND_POWER_OF_TWO_SIGNED(ipred, FILTER_INTRA_PREC_BITS);
- buffer[r][c] = clip_pixel(buffer[r][c] + mean) - mean;
+ buffer[r][c] = clip_pixel(buffer[r][c]);
}
for (r = 0; r < bh; ++r) {
for (c = 0; c < bw; ++c) {
- dst[c] = clip_pixel(buffer[r + 1][c + 1] + mean);
+ dst[c] = clip_pixel(buffer[r + 1][c + 1]);
}
dst += stride;
}
@@ -1564,29 +1495,6 @@
#endif
}
-void av1_d45_filter_predictor_c(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size,
- const uint8_t *above, const uint8_t *left) {
-#if USE_3TAP_INTRA_FILTER
- filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D45_PRED);
-#else
- filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D45_PRED);
-#endif
-}
-
-void av1_d135_filter_predictor_c(uint8_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint8_t *above,
- const uint8_t *left) {
-#if USE_3TAP_INTRA_FILTER
- filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D135_PRED);
-#else
- filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D135_PRED);
-#endif
-}
-
void av1_d117_filter_predictor_c(uint8_t *dst, ptrdiff_t stride,
TX_SIZE tx_size, const uint8_t *above,
const uint8_t *left) {
@@ -1611,29 +1519,6 @@
#endif
}
-void av1_d207_filter_predictor_c(uint8_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint8_t *above,
- const uint8_t *left) {
-#if USE_3TAP_INTRA_FILTER
- filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D207_PRED);
-#else
- filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D207_PRED);
-#endif
-}
-
-void av1_d63_filter_predictor_c(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size,
- const uint8_t *above, const uint8_t *left) {
-#if USE_3TAP_INTRA_FILTER
- filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D63_PRED);
-#else
- filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D63_PRED);
-#endif
-}
-
void av1_paeth_filter_predictor_c(uint8_t *dst, ptrdiff_t stride,
TX_SIZE tx_size, const uint8_t *above,
const uint8_t *left) {
@@ -1659,24 +1544,12 @@
case FILTER_H_PRED:
av1_h_filter_predictor(dst, stride, tx_size, above, left);
break;
- case FILTER_D45_PRED:
- av1_d45_filter_predictor(dst, stride, tx_size, above, left);
- break;
- case FILTER_D135_PRED:
- av1_d135_filter_predictor(dst, stride, tx_size, above, left);
- break;
case FILTER_D117_PRED:
av1_d117_filter_predictor(dst, stride, tx_size, above, left);
break;
case FILTER_D153_PRED:
av1_d153_filter_predictor(dst, stride, tx_size, above, left);
break;
- case FILTER_D207_PRED:
- av1_d207_filter_predictor(dst, stride, tx_size, above, left);
- break;
- case FILTER_D63_PRED:
- av1_d63_filter_predictor(dst, stride, tx_size, above, left);
- break;
case FILTER_PAETH_PRED:
av1_paeth_filter_predictor(dst, stride, tx_size, above, left);
break;
@@ -1691,7 +1564,7 @@
const uint16_t *left, int mode,
int bd) {
int r, c;
- int mean, ipred;
+ int ipred;
#if CONFIG_TX64X64
int preds[65][65];
#else
@@ -1703,30 +1576,21 @@
const int bw = tx_size_wide[tx_size];
const int bh = tx_size_high[tx_size];
- mean = 0;
- for (r = 0; r < bh; ++r) {
- mean += (int)left[r];
- }
- for (c = 0; c < bw; ++c) {
- mean += (int)above[c];
- }
- mean = (mean + ((bw + bh) >> 1)) / (bw + bh);
+ for (r = 0; r < bh; ++r) preds[r + 1][0] = (int)left[r];
- for (r = 0; r < bh; ++r) preds[r + 1][0] = (int)left[r] - mean;
-
- for (c = 0; c < bw + 1; ++c) preds[0][c] = (int)above[c - 1] - mean;
+ for (c = 0; c < bw + 1; ++c) preds[0][c] = (int)above[c - 1];
for (r = 1; r < bh + 1; ++r)
for (c = 1; c < bw + 1; ++c) {
ipred = c0 * preds[r - 1][c] + c1 * preds[r][c - 1] +
c2 * preds[r - 1][c - 1];
preds[r][c] = ROUND_POWER_OF_TWO_SIGNED(ipred, FILTER_INTRA_PREC_BITS);
- preds[r][c] = clip_pixel_highbd(preds[r][c] + mean, bd) - mean;
+ preds[r][c] = clip_pixel_highbd(preds[r][c], bd);
}
for (r = 0; r < bh; ++r) {
for (c = 0; c < bw; ++c) {
- dst[c] = clip_pixel_highbd(preds[r + 1][c + 1] + mean, bd);
+ dst[c] = clip_pixel_highbd(preds[r + 1][c + 1], bd);
}
dst += stride;
}
@@ -1817,30 +1681,6 @@
#endif
}
-void av1_highbd_d45_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint16_t *above,
- const uint16_t *left, int bd) {
-#if USE_3TAP_INTRA_FILTER
- highbd_filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D45_PRED, bd);
-#else
- highbd_filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D45_PRED, bd);
-#endif
-}
-
-void av1_highbd_d135_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint16_t *above,
- const uint16_t *left, int bd) {
-#if USE_3TAP_INTRA_FILTER
- highbd_filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D135_PRED, bd);
-#else
- highbd_filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D135_PRED, bd);
-#endif
-}
-
void av1_highbd_d117_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
TX_SIZE tx_size, const uint16_t *above,
const uint16_t *left, int bd) {
@@ -1865,30 +1705,6 @@
#endif
}
-void av1_highbd_d207_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint16_t *above,
- const uint16_t *left, int bd) {
-#if USE_3TAP_INTRA_FILTER
- highbd_filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D207_PRED, bd);
-#else
- highbd_filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D207_PRED, bd);
-#endif
-}
-
-void av1_highbd_d63_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
- TX_SIZE tx_size, const uint16_t *above,
- const uint16_t *left, int bd) {
-#if USE_3TAP_INTRA_FILTER
- highbd_filter_intra_predictors_3tap(dst, stride, tx_size, above, left,
- FILTER_D63_PRED, bd);
-#else
- highbd_filter_intra_predictors_4tap(dst, stride, tx_size, above, left,
- FILTER_D63_PRED, bd);
-#endif
-}
-
void av1_highbd_paeth_filter_predictor_c(uint16_t *dst, ptrdiff_t stride,
TX_SIZE tx_size, const uint16_t *above,
const uint16_t *left, int bd) {
@@ -1916,24 +1732,12 @@
case FILTER_H_PRED:
av1_highbd_h_filter_predictor(dst, stride, tx_size, above, left, bd);
break;
- case FILTER_D45_PRED:
- av1_highbd_d45_filter_predictor(dst, stride, tx_size, above, left, bd);
- break;
- case FILTER_D135_PRED:
- av1_highbd_d135_filter_predictor(dst, stride, tx_size, above, left, bd);
- break;
case FILTER_D117_PRED:
av1_highbd_d117_filter_predictor(dst, stride, tx_size, above, left, bd);
break;
case FILTER_D153_PRED:
av1_highbd_d153_filter_predictor(dst, stride, tx_size, above, left, bd);
break;
- case FILTER_D207_PRED:
- av1_highbd_d207_filter_predictor(dst, stride, tx_size, above, left, bd);
- break;
- case FILTER_D63_PRED:
- av1_highbd_d63_filter_predictor(dst, stride, tx_size, above, left, bd);
- break;
case FILTER_PAETH_PRED:
av1_highbd_paeth_filter_predictor(dst, stride, tx_size, above, left, bd);
break;
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 719cef2..e9164ef 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -859,8 +859,7 @@
#if CONFIG_FILTER_INTRA
static void read_filter_intra_mode_info(AV1_COMMON *const cm,
- MACROBLOCKD *const xd, int mi_row,
- int mi_col, aom_reader *r) {
+ MACROBLOCKD *const xd, aom_reader *r) {
MODE_INFO *const mi = xd->mi[0];
MB_MODE_INFO *const mbmi = &mi->mbmi;
FRAME_COUNTS *counts = xd->counts;
@@ -880,26 +879,6 @@
->filter_intra[0][filter_intra_mode_info->use_filter_intra_mode[0]];
}
}
-
- if (!is_chroma_reference(mi_row, mi_col, mbmi->sb_type,
- xd->plane[1].subsampling_x,
- xd->plane[1].subsampling_y))
- return;
-
- if (mbmi->uv_mode == UV_DC_PRED &&
- mbmi->palette_mode_info.palette_size[1] == 0) {
- filter_intra_mode_info->use_filter_intra_mode[1] =
- aom_read(r, cm->fc->filter_intra_probs[1], ACCT_STR);
- if (filter_intra_mode_info->use_filter_intra_mode[1]) {
- filter_intra_mode_info->filter_intra_mode[1] =
- aom_read_symbol(r, xd->tile_ctx->filter_intra_mode_cdf[1],
- FILTER_INTRA_MODES, ACCT_STR);
- }
- if (counts) {
- ++counts
- ->filter_intra[1][filter_intra_mode_info->use_filter_intra_mode[1]];
- }
- }
}
#endif // CONFIG_FILTER_INTRA
@@ -971,9 +950,21 @@
r, ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
} else if (ALLOW_INTRA_EXT_TX) {
+#if CONFIG_FILTER_INTRA
+ PREDICTION_MODE intra_dir;
+ if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+ intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
+ else
+ intra_dir = mbmi->mode;
+ *tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
+ r, ec_ctx->intra_ext_tx_cdf[eset][square_tx_size][intra_dir],
+ av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
+#else
*tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
r, ec_ctx->intra_ext_tx_cdf[eset][square_tx_size][mbmi->mode],
av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
+#endif
}
#else
// only signal tx_type when lgt is not allowed or not selected
@@ -1276,7 +1267,7 @@
#if CONFIG_FILTER_INTRA
mbmi->filter_intra_mode_info.use_filter_intra_mode[0] = 0;
mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
- read_filter_intra_mode_info(cm, xd, mi_row, mi_col, r);
+ read_filter_intra_mode_info(cm, xd, r);
#endif // CONFIG_FILTER_INTRA
#if !CONFIG_TXK_SEL
@@ -1812,7 +1803,7 @@
#if CONFIG_FILTER_INTRA
mbmi->filter_intra_mode_info.use_filter_intra_mode[0] = 0;
mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 0;
- read_filter_intra_mode_info(cm, xd, mi_row, mi_col, r);
+ read_filter_intra_mode_info(cm, xd, r);
#endif // CONFIG_FILTER_INTRA
}
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index c73f022..4a41eb7 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1048,7 +1048,6 @@
static void write_filter_intra_mode_info(const AV1_COMMON *const cm,
const MACROBLOCKD *xd,
const MB_MODE_INFO *const mbmi,
- int mi_row, int mi_col,
aom_writer *w) {
if (mbmi->mode == DC_PRED && mbmi->palette_mode_info.palette_size[0] == 0) {
aom_write(w, mbmi->filter_intra_mode_info.use_filter_intra_mode[0],
@@ -1060,23 +1059,6 @@
FILTER_INTRA_MODES);
}
}
-
- if (!is_chroma_reference(mi_row, mi_col, mbmi->sb_type,
- xd->plane[1].subsampling_x,
- xd->plane[1].subsampling_y))
- return;
-
- if (mbmi->uv_mode == UV_DC_PRED &&
- mbmi->palette_mode_info.palette_size[1] == 0) {
- aom_write(w, mbmi->filter_intra_mode_info.use_filter_intra_mode[1],
- cm->fc->filter_intra_probs[1]);
- if (mbmi->filter_intra_mode_info.use_filter_intra_mode[1]) {
- const FILTER_INTRA_MODE mode =
- mbmi->filter_intra_mode_info.filter_intra_mode[1];
- aom_write_symbol(w, mode, xd->tile_ctx->filter_intra_mode_cdf[1],
- FILTER_INTRA_MODES);
- }
- }
}
#endif // CONFIG_FILTER_INTRA
@@ -1389,10 +1371,23 @@
ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
av1_num_ext_tx_set[tx_set_type]);
} else if (ALLOW_INTRA_EXT_TX) {
+#if CONFIG_FILTER_INTRA
+ PREDICTION_MODE intra_dir;
+ if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+ intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
+ else
+ intra_dir = mbmi->mode;
+ aom_write_symbol(
+ w, av1_ext_tx_ind[tx_set_type][tx_type],
+ ec_ctx->intra_ext_tx_cdf[eset][square_tx_size][intra_dir],
+ av1_num_ext_tx_set[tx_set_type]);
+#else
aom_write_symbol(
w, av1_ext_tx_ind[tx_set_type][tx_type],
ec_ctx->intra_ext_tx_cdf[eset][square_tx_size][mbmi->mode],
av1_num_ext_tx_set[tx_set_type]);
+#endif
}
#else
// only signal tx_type when lgt is not allowed or not selected
@@ -1618,7 +1613,7 @@
if (av1_allow_palette(cm->allow_screen_content_tools, bsize))
write_palette_mode_info(cm, xd, mi, w);
#if CONFIG_FILTER_INTRA
- write_filter_intra_mode_info(cm, xd, mbmi, mi_row, mi_col, w);
+ write_filter_intra_mode_info(cm, xd, mbmi, w);
#endif // CONFIG_FILTER_INTRA
} else {
int16_t mode_ctx;
@@ -1937,7 +1932,7 @@
if (av1_allow_palette(cm->allow_screen_content_tools, bsize))
write_palette_mode_info(cm, xd, mi, w);
#if CONFIG_FILTER_INTRA
- write_filter_intra_mode_info(cm, xd, mbmi, mi_row, mi_col, w);
+ write_filter_intra_mode_info(cm, xd, mbmi, w);
#endif // CONFIG_FILTER_INTRA
#if !CONFIG_TXK_SEL
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 6f1f341..32e301e 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4245,25 +4245,14 @@
const int use_filter_intra_mode =
mbmi->filter_intra_mode_info.use_filter_intra_mode[0];
++counts->filter_intra[0][use_filter_intra_mode];
+#if CONFIG_ENTROPY_STATS
++counts->filter_intra_mode[0][mbmi->filter_intra_mode_info
.filter_intra_mode[0]];
+#endif // CONFIG_ENTROPY_STATS
update_cdf(fc->filter_intra_mode_cdf[0],
mbmi->filter_intra_mode_info.filter_intra_mode[0],
FILTER_INTRA_MODES);
}
- if (mbmi->uv_mode == UV_DC_PRED &&
- is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
- xd->plane[1].subsampling_y) &&
- mbmi->palette_mode_info.palette_size[1] == 0) {
- const int use_filter_intra_mode =
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1];
- ++counts->filter_intra[1][use_filter_intra_mode];
- ++counts->filter_intra_mode[1][mbmi->filter_intra_mode_info
- .filter_intra_mode[1]];
- update_cdf(fc->filter_intra_mode_cdf[1],
- mbmi->filter_intra_mode_info.filter_intra_mode[1],
- FILTER_INTRA_MODES);
- }
#endif // CONFIG_FILTER_INTRA
if (!is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
@@ -4506,6 +4495,22 @@
++counts->inter_ext_tx[eset][txsize_sqr_map[tx_size]][tx_type];
#endif // CONFIG_ENTROPY_STATS
} else {
+#if CONFIG_FILTER_INTRA
+ PREDICTION_MODE intra_dir;
+ if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+ intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
+ else
+ intra_dir = mbmi->mode;
+#if CONFIG_ENTROPY_STATS
+ ++counts
+ ->intra_ext_tx[eset][txsize_sqr_map[tx_size]][intra_dir][tx_type];
+#endif // CONFIG_ENTROPY_STATS
+ update_cdf(
+ fc->intra_ext_tx_cdf[eset][txsize_sqr_map[tx_size]][intra_dir],
+ av1_ext_tx_ind[tx_set_type][tx_type],
+ av1_num_ext_tx_set[tx_set_type]);
+#else
#if CONFIG_ENTROPY_STATS
++counts->intra_ext_tx[eset][txsize_sqr_map[tx_size]][mbmi->mode]
[tx_type];
@@ -4514,6 +4519,7 @@
fc->intra_ext_tx_cdf[eset][txsize_sqr_map[tx_size]][mbmi->mode],
av1_ext_tx_ind[tx_set_type][tx_type],
av1_num_ext_tx_set[tx_set_type]);
+#endif
}
#else
(void)tx_type;
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 0753e3d..8643caf 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -143,10 +143,8 @@
NULL);
#if CONFIG_FILTER_INTRA
- for (i = 0; i < 2; ++i) {
- av1_cost_tokens_from_cdf(x->filter_intra_mode_cost[i],
- fc->filter_intra_mode_cdf[i], NULL);
- }
+ av1_cost_tokens_from_cdf(x->filter_intra_mode_cost[0],
+ fc->filter_intra_mode_cdf[0], NULL);
#endif
for (i = 0; i < SWITCHABLE_FILTER_CONTEXTS; ++i)
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index fdc5f77..438f923 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2356,9 +2356,21 @@
return x
->inter_tx_type_costs[ext_tx_set][txsize_sqr_map[tx_size]][tx_type];
} else {
- if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX)
+ if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) {
+#if CONFIG_FILTER_INTRA
+ PREDICTION_MODE intra_dir;
+ if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+ intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
+ else
+ intra_dir = mbmi->mode;
+ return x->intra_tx_type_costs[ext_tx_set][txsize_sqr_map[tx_size]]
+ [intra_dir][tx_type];
+#else
return x->intra_tx_type_costs[ext_tx_set][txsize_sqr_map[tx_size]]
[mbmi->mode][tx_type];
+#endif
+ }
}
}
#else
@@ -3021,8 +3033,7 @@
const aom_prob prob = cpi->common.fc->filter_intra_probs[0];
if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0]) {
const int mode = mbmi->filter_intra_mode_info.filter_intra_mode[0];
- mode_cost += (av1_cost_bit(prob, 1) +
- write_uniform_cost(FILTER_INTRA_MODES, mode));
+ mode_cost += av1_cost_bit(prob, 1) + x->filter_intra_mode_cost[0][mode];
} else {
mode_cost += av1_cost_bit(prob, 0);
}
@@ -4579,10 +4590,22 @@
[txsize_sqr_map[mbmi->min_tx_size]]
[mbmi->tx_type];
} else {
- if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX)
+ if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) {
+#if CONFIG_FILTER_INTRA
+ PREDICTION_MODE intra_dir;
+ if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
+ intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
+ else
+ intra_dir = mbmi->mode;
rd_stats->rate +=
- x->intra_tx_type_costs[ext_tx_set][mbmi->min_tx_size][mbmi->mode]
+ x->intra_tx_type_costs[ext_tx_set][mbmi->min_tx_size][intra_dir]
[mbmi->tx_type];
+#else
+ rd_stats->rate += x->intra_tx_type_costs[ext_tx_set][mbmi->min_tx_size]
+ [mbmi->mode][mbmi->tx_type];
+#endif
+ }
}
}
#if CONFIG_LGT_FROM_PRED
@@ -5260,60 +5283,6 @@
}
}
-#if CONFIG_FILTER_INTRA
-// Return 1 if an filter intra mode is selected; return 0 otherwise.
-static int rd_pick_filter_intra_sbuv(const AV1_COMP *const cpi, MACROBLOCK *x,
- int *rate, int *rate_tokenonly,
- int64_t *distortion, int *skippable,
- BLOCK_SIZE bsize, int64_t *best_rd) {
- MACROBLOCKD *const xd = &x->e_mbd;
- MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
- int filter_intra_selected_flag = 0;
- int this_rate;
- int64_t this_rd;
- FILTER_INTRA_MODE mode;
- FILTER_INTRA_MODE_INFO filter_intra_mode_info;
- RD_STATS tokenonly_rd_stats;
-
- av1_zero(filter_intra_mode_info);
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1] = 1;
- mbmi->uv_mode = UV_DC_PRED;
- mbmi->palette_mode_info.palette_size[1] = 0;
-
- for (mode = 0; mode < FILTER_INTRA_MODES; ++mode) {
- mbmi->filter_intra_mode_info.filter_intra_mode[1] = mode;
- if (!super_block_uvrd(cpi, x, &tokenonly_rd_stats, bsize, *best_rd))
- continue;
-
- this_rate = tokenonly_rd_stats.rate +
- av1_cost_bit(cpi->common.fc->filter_intra_probs[1], 1) +
- x->intra_uv_mode_cost[mbmi->mode][mbmi->uv_mode] +
- x->filter_intra_mode_cost[1][mode];
- this_rd = RDCOST(x->rdmult, this_rate, tokenonly_rd_stats.dist);
- if (this_rd < *best_rd) {
- *best_rd = this_rd;
- *rate = this_rate;
- *rate_tokenonly = tokenonly_rd_stats.rate;
- *distortion = tokenonly_rd_stats.dist;
- *skippable = tokenonly_rd_stats.skip;
- filter_intra_mode_info = mbmi->filter_intra_mode_info;
- filter_intra_selected_flag = 1;
- }
- }
-
- if (filter_intra_selected_flag) {
- mbmi->uv_mode = UV_DC_PRED;
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1] =
- filter_intra_mode_info.use_filter_intra_mode[1];
- mbmi->filter_intra_mode_info.filter_intra_mode[1] =
- filter_intra_mode_info.filter_intra_mode[1];
- return 1;
- } else {
- return 0;
- }
-}
-#endif // CONFIG_FILTER_INTRA
-
#if CONFIG_EXT_INTRA
// Run RD calculation with given chroma intra prediction angle., and return
// the RD cost. Update the best mode info. if the RD cost is the best so far.
@@ -5570,10 +5539,7 @@
MAX_ANGLE_DELTA + mbmi->angle_delta[1]);
}
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- if (mbmi->sb_type >= BLOCK_8X8 && mode == UV_DC_PRED)
- this_rate += av1_cost_bit(cpi->common.fc->filter_intra_probs[1], 0);
-#endif // CONFIG_FILTER_INTRA
+
if (try_palette && mode == UV_DC_PRED)
this_rate += x->palette_uv_mode_cost[pmi->palette_size[0] > 0][0];
@@ -5597,14 +5563,6 @@
rate, rate_tokenonly, distortion, skippable);
}
-#if CONFIG_FILTER_INTRA
- if (mbmi->sb_type >= BLOCK_8X8) {
- if (rd_pick_filter_intra_sbuv(cpi, x, rate, rate_tokenonly, distortion,
- skippable, bsize, &best_rd))
- best_mbmi = *mbmi;
- }
-#endif // CONFIG_FILTER_INTRA
-
*mbmi = best_mbmi;
// Make sure we actually chose a mode
assert(best_rd < INT64_MAX);
@@ -9318,156 +9276,6 @@
plane_block_height);
}
-#if CONFIG_FILTER_INTRA
-static void pick_filter_intra_interframe(
- const AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int mi_row,
- int mi_col, int *rate_uv_intra, int *rate_uv_tokenonly, int64_t *dist_uv,
- int *skip_uv, UV_PREDICTION_MODE *mode_uv,
- FILTER_INTRA_MODE_INFO *filter_intra_mode_info_uv,
-#if CONFIG_EXT_INTRA
- int8_t *uv_angle_delta,
-#endif // CONFIG_EXT_INTRA
- PALETTE_MODE_INFO *pmi_uv, int palette_ctx, int skip_mask,
- unsigned int *ref_costs_single, int64_t *best_rd, int64_t *best_intra_rd,
- PREDICTION_MODE *best_intra_mode, int *best_mode_index, int *best_skip2,
- int *best_mode_skippable, int64_t *best_pred_rd, MB_MODE_INFO *best_mbmode,
- RD_STATS *rd_cost) {
- const AV1_COMMON *const cm = &cpi->common;
- MACROBLOCKD *const xd = &x->e_mbd;
- MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
- PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
- const int try_palette =
- av1_allow_palette(cm->allow_screen_content_tools, mbmi->sb_type);
- int rate2 = 0, rate_y = INT_MAX, skippable = 0, rate_uv, rate_dummy, i;
- int dc_mode_index;
- const int *const intra_mode_cost = x->mbmode_cost[size_group_lookup[bsize]];
- int64_t distortion2 = 0, distortion_y = 0, this_rd = *best_rd;
- int64_t distortion_uv, model_rd = INT64_MAX;
- TX_SIZE uv_tx;
-
- for (i = 0; i < MAX_MODES; ++i)
- if (av1_mode_order[i].mode == DC_PRED &&
- av1_mode_order[i].ref_frame[0] == INTRA_FRAME)
- break;
- dc_mode_index = i;
- assert(i < MAX_MODES);
-
- // TODO(huisu): use skip_mask for further speedup.
- (void)skip_mask;
- mbmi->mode = DC_PRED;
- mbmi->uv_mode = UV_DC_PRED;
- mbmi->ref_frame[0] = INTRA_FRAME;
- mbmi->ref_frame[1] = NONE_FRAME;
- if (!rd_pick_filter_intra_sby(cpi, x, &rate_dummy, &rate_y, &distortion_y,
- &skippable, bsize, intra_mode_cost[mbmi->mode],
- &this_rd, &model_rd, 0)) {
- return;
- }
- if (rate_y == INT_MAX) return;
-
- uv_tx = uv_txsize_lookup[bsize][mbmi->tx_size][xd->plane[1].subsampling_x]
- [xd->plane[1].subsampling_y];
- if (rate_uv_intra[uv_tx] == INT_MAX) {
- choose_intra_uv_mode(cpi, x, bsize, uv_tx, &rate_uv_intra[uv_tx],
- &rate_uv_tokenonly[uv_tx], &dist_uv[uv_tx],
- &skip_uv[uv_tx], &mode_uv[uv_tx]);
- if (cm->allow_screen_content_tools) pmi_uv[uv_tx] = *pmi;
- filter_intra_mode_info_uv[uv_tx] = mbmi->filter_intra_mode_info;
-#if CONFIG_EXT_INTRA
- uv_angle_delta[uv_tx] = mbmi->angle_delta[1];
-#endif // CONFIG_EXT_INTRA
- }
-
- rate_uv = rate_uv_tokenonly[uv_tx];
- distortion_uv = dist_uv[uv_tx];
- skippable = skippable && skip_uv[uv_tx];
- mbmi->uv_mode = mode_uv[uv_tx];
- if (cm->allow_screen_content_tools) {
- pmi->palette_size[1] = pmi_uv[uv_tx].palette_size[1];
- memcpy(pmi->palette_colors + PALETTE_MAX_SIZE,
- pmi_uv[uv_tx].palette_colors + PALETTE_MAX_SIZE,
- 2 * PALETTE_MAX_SIZE * sizeof(pmi->palette_colors[0]));
- }
-#if CONFIG_EXT_INTRA
- mbmi->angle_delta[1] = uv_angle_delta[uv_tx];
-#endif // CONFIG_EXT_INTRA
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1];
- if (filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1]) {
- mbmi->filter_intra_mode_info.filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].filter_intra_mode[1];
- }
-
- rate2 = rate_y + intra_mode_cost[mbmi->mode] + rate_uv +
- x->intra_uv_mode_cost[mbmi->mode][mbmi->uv_mode];
- if (try_palette && mbmi->mode == DC_PRED)
- rate2 += x->palette_y_mode_cost[bsize - BLOCK_8X8][palette_ctx][0];
-
- if (!xd->lossless[mbmi->segment_id]) {
- // super_block_yrd above includes the cost of the tx_size in the
- // tokenonly rate, but for intra blocks, tx_size is always coded
- // (prediction granularity), so we account for it in the full rate,
- // not the tokenonly rate.
- rate_y -= tx_size_cost(cm, x, bsize, mbmi->tx_size);
- }
-
- rate2 += av1_cost_bit(cm->fc->filter_intra_probs[0],
- mbmi->filter_intra_mode_info.use_filter_intra_mode[0]);
- rate2 += write_uniform_cost(
- FILTER_INTRA_MODES, mbmi->filter_intra_mode_info.filter_intra_mode[0]);
-#if CONFIG_EXT_INTRA
- if (av1_is_directional_mode(get_uv_mode(mbmi->uv_mode), bsize) &&
- av1_use_angle_delta(bsize)) {
- rate2 += write_uniform_cost(2 * MAX_ANGLE_DELTA + 1,
- MAX_ANGLE_DELTA + mbmi->angle_delta[1]);
- }
-#endif // CONFIG_EXT_INTRA
- if (mbmi->uv_mode == UV_DC_PRED) {
- rate2 +=
- av1_cost_bit(cpi->common.fc->filter_intra_probs[1],
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1]);
- if (mbmi->filter_intra_mode_info.use_filter_intra_mode[1])
- rate2 +=
- write_uniform_cost(FILTER_INTRA_MODES,
- mbmi->filter_intra_mode_info.filter_intra_mode[1]);
- }
- distortion2 = distortion_y + distortion_uv;
- av1_encode_intra_block_plane((AV1_COMMON *)cm, x, bsize, 0, 0, mi_row,
- mi_col);
-
- rate2 += ref_costs_single[INTRA_FRAME];
-
- if (skippable) {
- rate2 -= (rate_y + rate_uv);
- rate_y = 0;
- rate_uv = 0;
- rate2 += x->skip_cost[av1_get_skip_context(xd)][1];
- } else {
- rate2 += x->skip_cost[av1_get_skip_context(xd)][0];
- }
- this_rd = RDCOST(x->rdmult, rate2, distortion2);
-
- if (this_rd < *best_intra_rd) {
- *best_intra_rd = this_rd;
- *best_intra_mode = mbmi->mode;
- }
- for (i = 0; i < REFERENCE_MODES; ++i)
- best_pred_rd[i] = AOMMIN(best_pred_rd[i], this_rd);
-
- if (this_rd < *best_rd) {
- *best_mode_index = dc_mode_index;
- mbmi->mv[0].as_int = 0;
- rd_cost->rate = rate2;
- rd_cost->dist = distortion2;
- rd_cost->rdcost = this_rd;
- *best_rd = this_rd;
- *best_mbmode = *mbmi;
- *best_skip2 = 0;
- *best_mode_skippable = skippable;
- }
-}
-#endif // CONFIG_FILTER_INTRA
-
#if CONFIG_MOTION_VAR
static void calc_target_weighted_pred(const AV1_COMMON *cm, const MACROBLOCK *x,
const MACROBLOCKD *xd, int mi_row,
@@ -9540,10 +9348,6 @@
int is_directional_mode, angle_stats_ready = 0;
uint8_t directional_mode_skip_mask[INTRA_MODES];
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- int8_t dc_skipped = 1;
- FILTER_INTRA_MODE_INFO filter_intra_mode_info_uv[TX_SIZES_ALL];
-#endif // CONFIG_FILTER_INTRA
const int intra_cost_penalty = av1_get_intra_cost_penalty(
cm->base_qindex, cm->y_dc_delta_q, cm->bit_depth);
const int *const intra_mode_cost = x->mbmode_cost[size_group_lookup[bsize]];
@@ -10122,11 +9926,64 @@
distortion_y = rd_stats_y.dist;
skippable = rd_stats_y.skip;
- if (rate_y == INT_MAX) continue;
-
#if CONFIG_FILTER_INTRA
- if (mbmi->mode == DC_PRED) dc_skipped = 0;
-#endif // CONFIG_FILTER_INTRA
+ int64_t best_rd_tmp = INT64_MAX;
+ if (rate_y != INT_MAX) {
+ best_rd_tmp = RDCOST(
+ x->rdmult,
+ rate_y + av1_cost_bit(cpi->common.fc->filter_intra_probs[0], 0) +
+ intra_mode_cost[mbmi->mode],
+ distortion_y);
+ }
+ if (mbmi->mode == DC_PRED) {
+ RD_STATS rd_stats_y_fi;
+ int filter_intra_selected_flag = 0;
+ TX_SIZE best_tx_size = mbmi->tx_size;
+ TX_TYPE best_tx_type = mbmi->tx_type;
+ FILTER_INTRA_MODE best_fi_mode = FILTER_DC_PRED;
+
+ mbmi->filter_intra_mode_info.use_filter_intra_mode[0] = 1;
+ for (FILTER_INTRA_MODE fi_mode = FILTER_DC_PRED;
+ fi_mode < FILTER_INTRA_MODES; ++fi_mode) {
+ int this_rate_tmp;
+ int64_t this_rd_tmp;
+ mbmi->filter_intra_mode_info.filter_intra_mode[0] = fi_mode;
+
+ super_block_yrd(cpi, x, &rd_stats_y_fi, bsize, best_rd);
+ if (rd_stats_y_fi.rate == INT_MAX) continue;
+
+ this_rate_tmp =
+ rd_stats_y_fi.rate +
+ av1_cost_bit(cpi->common.fc->filter_intra_probs[0], 1) +
+ x->filter_intra_mode_cost[0][fi_mode] +
+ intra_mode_cost[mbmi->mode];
+ this_rd_tmp = RDCOST(x->rdmult, this_rate_tmp, rd_stats_y_fi.dist);
+
+ if (this_rd_tmp < best_rd_tmp) {
+ best_tx_size = mbmi->tx_size;
+ best_tx_type = mbmi->tx_type;
+ best_fi_mode = fi_mode;
+ rd_stats_y = rd_stats_y_fi;
+ rate_y = rd_stats_y_fi.rate;
+ distortion_y = rd_stats_y_fi.dist;
+ skippable = rd_stats_y_fi.skip;
+ filter_intra_selected_flag = 1;
+ best_rd_tmp = this_rd_tmp;
+ }
+ }
+
+ mbmi->tx_size = best_tx_size;
+ mbmi->tx_type = best_tx_type;
+ if (filter_intra_selected_flag) {
+ mbmi->filter_intra_mode_info.use_filter_intra_mode[0] = 1;
+ mbmi->filter_intra_mode_info.filter_intra_mode[0] = best_fi_mode;
+ } else {
+ mbmi->filter_intra_mode_info.use_filter_intra_mode[0] = 0;
+ }
+ }
+#endif
+
+ if (rate_y == INT_MAX) continue;
uv_tx = uv_txsize_lookup[bsize][mbmi->tx_size][pd->subsampling_x]
[pd->subsampling_y];
@@ -10139,9 +9996,6 @@
#if CONFIG_EXT_INTRA
uv_angle_delta[uv_tx] = mbmi->angle_delta[1];
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- filter_intra_mode_info_uv[uv_tx] = mbmi->filter_intra_mode_info;
-#endif // CONFIG_FILTER_INTRA
}
rate_uv = rate_uv_tokenonly[uv_tx];
@@ -10158,14 +10012,6 @@
#if CONFIG_EXT_INTRA
mbmi->angle_delta[1] = uv_angle_delta[uv_tx];
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1];
- if (filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1]) {
- mbmi->filter_intra_mode_info.filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].filter_intra_mode[1];
- }
-#endif // CONFIG_FILTER_INTRA
rate2 = rate_y + intra_mode_cost[mbmi->mode];
if (!x->skip_chroma_rd)
@@ -10201,20 +10047,10 @@
av1_cost_bit(cm->fc->filter_intra_probs[0],
mbmi->filter_intra_mode_info.use_filter_intra_mode[0]);
if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0]) {
- rate2 += write_uniform_cost(
- FILTER_INTRA_MODES,
- mbmi->filter_intra_mode_info.filter_intra_mode[0]);
+ rate2 += x->filter_intra_mode_cost[0][mbmi->filter_intra_mode_info
+ .filter_intra_mode[0]];
}
}
- if (mbmi->uv_mode == UV_DC_PRED) {
- rate2 +=
- av1_cost_bit(cpi->common.fc->filter_intra_probs[1],
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1]);
- if (mbmi->filter_intra_mode_info.use_filter_intra_mode[1])
- rate2 += write_uniform_cost(
- FILTER_INTRA_MODES,
- mbmi->filter_intra_mode_info.filter_intra_mode[1]);
- }
#endif // CONFIG_FILTER_INTRA
if (mbmi->mode != DC_PRED && mbmi->mode != PAETH_PRED)
rate2 += intra_cost_penalty;
@@ -10862,9 +10698,6 @@
#if CONFIG_EXT_INTRA
uv_angle_delta[uv_tx] = mbmi->angle_delta[1];
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- filter_intra_mode_info_uv[uv_tx] = mbmi->filter_intra_mode_info;
-#endif // CONFIG_FILTER_INTRA
}
mbmi->uv_mode = mode_uv[uv_tx];
pmi->palette_size[1] = pmi_uv[uv_tx].palette_size[1];
@@ -10876,14 +10709,6 @@
#if CONFIG_EXT_INTRA
mbmi->angle_delta[1] = uv_angle_delta[uv_tx];
#endif // CONFIG_EXT_INTRA
-#if CONFIG_FILTER_INTRA
- mbmi->filter_intra_mode_info.use_filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1];
- if (filter_intra_mode_info_uv[uv_tx].use_filter_intra_mode[1]) {
- mbmi->filter_intra_mode_info.filter_intra_mode[1] =
- filter_intra_mode_info_uv[uv_tx].filter_intra_mode[1];
- }
-#endif // CONFIG_FILTER_INTRA
skippable = rd_stats_y.skip && skip_uvs[uv_tx];
distortion2 = rd_stats_y.dist + dist_uvs[uv_tx];
rate2 = rd_stats_y.rate + rate_overhead_palette + rate_uv_intra[uv_tx];
@@ -10910,24 +10735,6 @@
}
PALETTE_EXIT:
-#if CONFIG_FILTER_INTRA
- // TODO(huisu): filter-intra is turned off in lossless mode for now to
- // avoid a unit test failure
- if (!xd->lossless[mbmi->segment_id] && pmi->palette_size[0] == 0 &&
- !dc_skipped && best_mode_index >= 0 &&
- best_intra_rd < (best_rd + (best_rd >> 3))) {
- pick_filter_intra_interframe(
- cpi, x, bsize, mi_row, mi_col, rate_uv_intra, rate_uv_tokenonly,
- dist_uvs, skip_uvs, mode_uv, filter_intra_mode_info_uv,
-#if CONFIG_EXT_INTRA
- uv_angle_delta,
-#endif // CONFIG_EXT_INTRA
- pmi_uv, palette_ctx, 0, ref_costs_single, &best_rd, &best_intra_rd,
- &best_intra_mode, &best_mode_index, &best_skip2, &best_mode_skippable,
- best_pred_rd, &best_mbmode, rd_cost);
- }
-#endif // CONFIG_FILTER_INTRA
-
// The inter modes' rate costs are not calculated precisely in some cases.
// Therefore, sometimes, NEWMV is chosen instead of NEARESTMV, NEARMV, and
// ZEROMV. Here, checks are added for those cases, and the mode decisions
