generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Add vp9_ prefix to init_macroblockd"

Browse Source
This commit is contained in:
Jingning Han 2015-07-07 22:35:44 +00:00 committed by Gerrit Code Review
commit c2d0f9ddeb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_onyxc_int.h
View File

@ -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;
}
static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) {
static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) {
int i;
for (i = 0; i < MAX_MB_PLANE; ++i) {

4
vp9/decoder/vp9_decodeframe.c
View File

@ -1324,7 +1324,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb,
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,
setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb,
pbi->decrypt_state);
init_macroblockd(cm, &tile_data->xd);
vp9_init_macroblockd(cm, &tile_data->xd);
worker->had_error = 0;
if (i == num_workers - 1 || n == tile_cols - 1) {

2
vp9/encoder/vp9_encoder.c
View File

@ -732,7 +732,7 @@ static void update_frame_size(VP9_COMP *cpi) {
vp9_set_mb_mi(cm, cm->width, cm->height);
vp9_init_context_buffers(cm);
init_macroblockd(cm, xd);
vp9_init_macroblockd(cm, xd);
cpi->td.mb.mbmi_ext_base = cpi->mbmi_ext_base;
memset(cpi->mbmi_ext_base, 0,
cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base));