Commit a652048e authored by Jingning Han's avatar Jingning Han

Add vp9_ prefix to init_macroblockd

Change-Id: I202d4924e627eec94838741df004ed9259d38b88
parent cccad1c5
...@@ -348,7 +348,7 @@ static INLINE void set_partition_probs(const VP9_COMMON *const cm, ...@@ -348,7 +348,7 @@ static INLINE void set_partition_probs(const VP9_COMMON *const cm,
(const vp9_prob (*)[PARTITION_TYPES - 1])cm->fc->partition_prob; (const vp9_prob (*)[PARTITION_TYPES - 1])cm->fc->partition_prob;
} }
static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) { static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) {
int i; int i;
for (i = 0; i < MAX_MB_PLANE; ++i) { for (i = 0; i < MAX_MB_PLANE; ++i) {
......
...@@ -1324,7 +1324,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, ...@@ -1324,7 +1324,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
setup_token_decoder(buf->data, data_end, buf->size, &cm->error, setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb, &tile_data->bit_reader, pbi->decrypt_cb,
pbi->decrypt_state); pbi->decrypt_state);
init_macroblockd(cm, &tile_data->xd); vp9_init_macroblockd(cm, &tile_data->xd);
} }
} }
...@@ -1544,7 +1544,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, ...@@ -1544,7 +1544,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi,
setup_token_decoder(buf->data, data_end, buf->size, &cm->error, setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb, &tile_data->bit_reader, pbi->decrypt_cb,
pbi->decrypt_state); pbi->decrypt_state);
init_macroblockd(cm, &tile_data->xd); vp9_init_macroblockd(cm, &tile_data->xd);
worker->had_error = 0; worker->had_error = 0;
if (i == num_workers - 1 || n == tile_cols - 1) { if (i == num_workers - 1 || n == tile_cols - 1) {
......
...@@ -732,7 +732,7 @@ static void update_frame_size(VP9_COMP *cpi) { ...@@ -732,7 +732,7 @@ static void update_frame_size(VP9_COMP *cpi) {
vp9_set_mb_mi(cm, cm->width, cm->height); vp9_set_mb_mi(cm, cm->width, cm->height);
vp9_init_context_buffers(cm); vp9_init_context_buffers(cm);
init_macroblockd(cm, xd); vp9_init_macroblockd(cm, xd);
cpi->td.mb.mbmi_ext_base = cpi->mbmi_ext_base; cpi->td.mb.mbmi_ext_base = cpi->mbmi_ext_base;
memset(cpi->mbmi_ext_base, 0, memset(cpi->mbmi_ext_base, 0,
cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base)); cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base));
......
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