Bring palette back to nextgenv2

It was removed by the master branch merge.

Change-Id: I4b2a524c9e052e41063359afcb4ba22bf78344cf
This commit is contained in:
hui su
2015-12-07 18:18:57 -08:00
parent 69f4930041
commit c93e5cc3e9
23 changed files with 1225 additions and 9 deletions

View File

@@ -83,6 +83,25 @@ static void fill_mode_costs(VP10_COMP *cpi) {
for (i = 0; i < SWITCHABLE_FILTER_CONTEXTS; ++i)
vp10_cost_tokens(cpi->switchable_interp_costs[i],
fc->switchable_interp_prob[i], vp10_switchable_interp_tree);
for (i = 0; i < PALETTE_BLOCK_SIZES; ++i) {
vp10_cost_tokens(cpi->palette_y_size_cost[i],
vp10_default_palette_y_size_prob[i],
vp10_palette_size_tree);
vp10_cost_tokens(cpi->palette_uv_size_cost[i],
vp10_default_palette_uv_size_prob[i],
vp10_palette_size_tree);
}
for (i = 0; i < PALETTE_MAX_SIZE - 1; ++i)
for (j = 0; j < PALETTE_COLOR_CONTEXTS; ++j) {
vp10_cost_tokens(cpi->palette_y_color_cost[i][j],
vp10_default_palette_y_color_prob[i][j],
vp10_palette_color_tree[i]);
vp10_cost_tokens(cpi->palette_uv_color_cost[i][j],
vp10_default_palette_uv_color_prob[i][j],
vp10_palette_color_tree[i]);
}
#if CONFIG_EXT_TX
for (i = TX_4X4; i < EXT_TX_SIZES; ++i) {
int s;