Commit 57fa6267 authored by Brennan Shacklett's avatar Brennan Shacklett

Remove color_index_map

Dead code.

Change-Id: I13ed4007865e45e41fc79dfb63cbd01500a1d3ae
parent b9a564a7
......@@ -185,7 +185,6 @@ struct macroblockd_plane {
ENTROPY_CONTEXT *above_context;
ENTROPY_CONTEXT *left_context;
int16_t seg_dequant[MAX_SEGMENTS][2];
uint8_t *color_index_map;
// number of 4x4s in current block
uint16_t n4_w, n4_h;
......
......@@ -1280,8 +1280,6 @@ static const uint8_t *decode_tiles(AV1Decoder *pbi, const uint8_t *data,
&tile_data->bit_reader, pbi->decrypt_cb,
pbi->decrypt_state);
av1_init_macroblockd(cm, &tile_data->xd, tile_data->dqcoeff);
tile_data->xd.plane[0].color_index_map = tile_data->color_index_map[0];
tile_data->xd.plane[1].color_index_map = tile_data->color_index_map[1];
}
}
......@@ -1506,8 +1504,6 @@ static const uint8_t *decode_tiles_mt(AV1Decoder *pbi, const uint8_t *data,
&tile_data->bit_reader, pbi->decrypt_cb,
pbi->decrypt_state);
av1_init_macroblockd(cm, &tile_data->xd, tile_data->dqcoeff);
tile_data->xd.plane[0].color_index_map = tile_data->color_index_map[0];
tile_data->xd.plane[1].color_index_map = tile_data->color_index_map[1];
worker->had_error = 0;
if (i == num_workers - 1 || n == tile_cols - 1) {
......
......@@ -34,7 +34,6 @@ typedef struct TileData {
DECLARE_ALIGNED(16, MACROBLOCKD, xd);
/* dqcoeff are shared by all the planes. So planes must be decoded serially */
DECLARE_ALIGNED(16, tran_low_t, dqcoeff[32 * 32]);
DECLARE_ALIGNED(16, uint8_t, color_index_map[2][64 * 64]);
} TileData;
typedef struct TileWorkerData {
......@@ -44,7 +43,6 @@ typedef struct TileWorkerData {
DECLARE_ALIGNED(16, MACROBLOCKD, xd);
/* dqcoeff are shared by all the planes. So planes must be decoded serially */
DECLARE_ALIGNED(16, tran_low_t, dqcoeff[32 * 32]);
DECLARE_ALIGNED(16, uint8_t, color_index_map[2][64 * 64]);
struct aom_internal_error_info error_info;
} TileWorkerData;
......
......@@ -47,11 +47,6 @@ static void free_mode_context(PICK_MODE_CONTEXT *ctx) {
aom_free(ctx->eobs[i]);
ctx->eobs[i] = 0;
}
for (i = 0; i < 2; ++i) {
aom_free(ctx->color_index_map[i]);
ctx->color_index_map[i] = 0;
}
}
static void alloc_tree_contexts(AV1_COMMON *cm, PC_TREE *tree,
......
......@@ -27,7 +27,6 @@ struct ThreadData;
typedef struct {
MODE_INFO mic;
MB_MODE_INFO_EXT mbmi_ext;
uint8_t *color_index_map[2];
tran_low_t *coeff[MAX_MB_PLANE];
tran_low_t *qcoeff[MAX_MB_PLANE];
tran_low_t *dqcoeff[MAX_MB_PLANE];
......
......@@ -951,8 +951,6 @@ static void update_state(const AV1_COMP *const cpi, ThreadData *td,
p[i].eobs = ctx->eobs[i];
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
// Restore the coding context of the MB to that that was in place
// when the mode was picked for it
for (y = 0; y < mi_height; y++)
......@@ -1087,8 +1085,6 @@ static void rd_pick_sb_modes(const AV1_COMP *const cpi, TileDataEnc *tile_data,
p[i].eobs = ctx->eobs[i];
}
for (i = 0; i < 2; ++i) pd[i].color_index_map = ctx->color_index_map[i];
ctx->skippable = 0;
ctx->pred_pixel_ready = 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