Add default CDF table for dual filter.

This fixes errors with EC_ADAPT where the CDF tables
are not built from 8-bit probabilities.

Change-Id: I2a35eef3d37503a8011db4089e11ba4da14bbf34
This commit is contained in:
Thomas Davies 2017-04-05 11:43:36 +01:00
Родитель 8ff52fccfa
Коммит 4ba27d0162
1 изменённых файлов: 17 добавлений и 0 удалений

Просмотреть файл

@ -1864,6 +1864,22 @@ static const aom_prob default_segment_pred_probs[PREDICTION_PROBS] = {
// clang-format on
#if CONFIG_EC_MULTISYMBOL
#if CONFIG_DUAL_FILTER
static const aom_cdf_prob
default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS][CDF_SIZE(
SWITCHABLE_FILTERS)] = {
{ 30080, 31088, 32096, 32768, 0 }, { 4608, 9620, 31338, 32768, 0 },
{ 4352, 5240, 6128, 32768, 0 }, { 4352, 5240, 6128, 32768, 0 },
{ 19072, 23352, 27632, 32768, 0 }, { 30080, 31088, 32096, 32768, 0 },
{ 4608, 9620, 31338, 32768, 0 }, { 4352, 5240, 6128, 32768, 0 },
{ 4352, 5240, 6128, 32768, 0 }, { 19072, 23352, 27632, 32768, 0 },
{ 30080, 31088, 32096, 32768, 0 }, { 4608, 9620, 31338, 32768, 0 },
{ 4352, 5240, 6128, 32768, 0 }, { 4352, 5240, 6128, 32768, 0 },
{ 19072, 23352, 27632, 32768, 0 }, { 30080, 31088, 32096, 32768, 0 },
{ 4608, 9620, 31338, 32768, 0 }, { 4352, 5240, 6128, 32768, 0 },
{ 4352, 5240, 6128, 32768, 0 }, { 19072, 23352, 27632, 32768, 0 }
};
#else
static const aom_cdf_prob
default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
[CDF_SIZE(SWITCHABLE_FILTERS)] = {
@ -1872,6 +1888,7 @@ static const aom_cdf_prob
{ 4352, 4685, 32768, 0 },
{ 19072, 26776, 32768, 0 },
};
#endif
static const aom_cdf_prob default_seg_tree_cdf[CDF_SIZE(MAX_SEGMENTS)] = {
4096, 8192, 12288, 16384, 20480, 24576, 28672, 32768, 0