Commit 8e6267fe authored by Thomas Davies's avatar Thomas Davies
Browse files

NEW_MULTISYMBOL: Fix sizes of default CDFs.

Change-Id: Iac17a7069749f10842dec75d5791aeadfa18f0f5
parent 686d4fd2
...@@ -688,7 +688,7 @@ static const aom_prob default_wedge_interintra_prob[BLOCK_SIZES_ALL] = { ...@@ -688,7 +688,7 @@ static const aom_prob default_wedge_interintra_prob[BLOCK_SIZES_ALL] = {
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
static const aom_cdf_prob static const aom_cdf_prob
default_wedge_interintra_cdf[BLOCK_SIZES][CDF_SIZE(2)] = { default_wedge_interintra_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 #if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{ 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(128 * 128), AOM_ICDF(32768), 0 },
...@@ -712,6 +712,10 @@ static const aom_cdf_prob ...@@ -712,6 +712,10 @@ static const aom_cdf_prob
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 }, { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 }, { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
#endif // CONFIG_EXT_PARTITION #endif // CONFIG_EXT_PARTITION
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
}; };
#endif // CONFIG_NEW_MULTISYMBOL #endif // CONFIG_NEW_MULTISYMBOL
...@@ -949,7 +953,7 @@ static const aom_prob default_obmc_prob[BLOCK_SIZES_ALL] = { ...@@ -949,7 +953,7 @@ static const aom_prob default_obmc_prob[BLOCK_SIZES_ALL] = {
}; };
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES][CDF_SIZE(2)] = { static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 #if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
{ 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(128 * 128), AOM_ICDF(32768), 0 },
...@@ -973,6 +977,10 @@ static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES][CDF_SIZE(2)] = { ...@@ -973,6 +977,10 @@ static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES][CDF_SIZE(2)] = {
{ AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 }, { AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 }, { AOM_ICDF(252 * 128), AOM_ICDF(32768), 0 },
#endif // CONFIG_EXT_PARTITION #endif // CONFIG_EXT_PARTITION
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
{ AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
}; };
#endif // CONFIG_NEW_MULTISYMBOL #endif // CONFIG_NEW_MULTISYMBOL
#endif #endif
......
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