Commit 9ab6e589 authored by Hui Su's avatar Hui Su Committed by Gerrit Code Review

Merge "Fixes for Palette mode" into nextgenv2

parents 80bc1d1d 8a128c2a
......@@ -1881,9 +1881,6 @@ static void decode_block(VP10Decoder *const pbi, MACROBLOCKD *const xd,
(xd->mb_to_bottom_edge >= 0 ?
0 : xd->mb_to_bottom_edge >> (5 + pd->subsampling_y));
if (plane <= 1 && mbmi->palette_mode_info.palette_size[plane])
vp10_decode_palette_tokens(xd, plane, r);
for (row = 0; row < max_blocks_high; row += step)
for (col = 0; col < max_blocks_wide; col += step)
predict_and_reconstruct_intra_block(xd,
......
......@@ -64,7 +64,7 @@ typedef struct {
typedef struct {
uint8_t best_palette_color_map[4096];
double kmeans_data_buf[4096];
double kmeans_data_buf[2 * 4096];
uint8_t kmeans_indices_buf[4096];
uint8_t kmeans_pre_indices_buf[4096];
} PALETTE_BUFFER;
......
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