Commit 7865349d authored by Thomas Davies's avatar Thomas Davies

Sync CDF initialisations with probs.

Default probabilities were updated in
d1b8c2a3. Update
recently-added CDFs not covered in this commit
to use these probabilities for initialisation.

AWCY: -0.03%

Change-Id: I5c34d1e890ddb0757df41848a0acc8509fcd4772
parent 9803b94a
......@@ -836,27 +836,26 @@ static const aom_prob default_motion_mode_prob[BLOCK_SIZES][MOTION_MODES - 1] =
{ 252, 200 }, { 252, 200 }, { 252, 200 },
#endif // CONFIG_EXT_PARTITION
};
static const aom_cdf_prob
default_motion_mode_cdf[BLOCK_SIZES][CDF_SIZE(MOTION_MODES)] = {
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
#endif
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(32640), AOM_ICDF(32740), AOM_ICDF(32768), 0 },
{ AOM_ICDF(19328), AOM_ICDF(29828), AOM_ICDF(32768), 0 },
{ AOM_ICDF(19584), AOM_ICDF(29884), AOM_ICDF(32768), 0 },
{ AOM_ICDF(18432), AOM_ICDF(29632), AOM_ICDF(32768), 0 },
{ AOM_ICDF(22784), AOM_ICDF(30584), AOM_ICDF(32768), 0 },
{ AOM_ICDF(21120), AOM_ICDF(30220), AOM_ICDF(32768), 0 },
{ AOM_ICDF(20480), AOM_ICDF(30080), AOM_ICDF(32768), 0 },
{ AOM_ICDF(26496), AOM_ICDF(31396), AOM_ICDF(32768), 0 },
{ AOM_ICDF(24960), AOM_ICDF(31060), AOM_ICDF(32768), 0 },
{ AOM_ICDF(21504), AOM_ICDF(30304), AOM_ICDF(32768), 0 },
{ AOM_ICDF(31232), AOM_ICDF(32432), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(7936), AOM_ICDF(19091), AOM_ICDF(32768), 0 },
{ AOM_ICDF(4991), AOM_ICDF(19205), AOM_ICDF(32768), 0 },
{ AOM_ICDF(4992), AOM_ICDF(19314), AOM_ICDF(32768), 0 },
{ AOM_ICDF(15104), AOM_ICDF(21590), AOM_ICDF(32768), 0 },
{ AOM_ICDF(9855), AOM_ICDF(21043), AOM_ICDF(32768), 0 },
{ AOM_ICDF(12800), AOM_ICDF(22238), AOM_ICDF(32768), 0 },
{ AOM_ICDF(24320), AOM_ICDF(26498), AOM_ICDF(32768), 0 },
{ AOM_ICDF(26496), AOM_ICDF(28995), AOM_ICDF(32768), 0 },
{ AOM_ICDF(25216), AOM_ICDF(28166), AOM_ICDF(32768), 0 },
{ AOM_ICDF(30592), AOM_ICDF(31238), AOM_ICDF(32768), 0 },
#if CONFIG_EXT_PARTITION
{ AOM_ICDF(32256), AOM_ICDF(32656), AOM_ICDF(32768), 0 },
{ AOM_ICDF(32256), AOM_ICDF(32656), AOM_ICDF(32768), 0 },
......@@ -878,23 +877,23 @@ static const aom_prob default_obmc_prob[BLOCK_SIZES] = {
#if CONFIG_NEW_MULTISYMBOL
static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES][CDF_SIZE(2)] = {
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
#endif
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(255 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(151 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(153 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(45 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(79 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(75 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(130 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(141 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(144 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(178 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(165 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(160 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(207 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(195 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(168 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(244 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(201 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(186 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(231 * 128), AOM_ICDF(32768), 0 },
#if CONFIG_EXT_PARTITION
{ AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment