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

Adding return value to set_offsets() function.

Browse Source 
Change-Id: I88e018442c527cf21eac791f0768e805dda244f1
This commit is contained in:
Dmitry Kovalev
2014-04-01 19:50:47 -07:00
parent 86f44a91f4
commit 5f8dd6c9ec
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/decoder/vp9_decodeframe.c
View File

@@ -291,9 +291,9 @@ static void reconstruct_inter_block(int plane, int block,
*args->eobtotal += eob; *args->eobtotal += eob;
} }
static void set_offsets(VP9_COMMON *const cm, MACROBLOCKD *const xd, static MB_MODE_INFO *set_offsets(VP9_COMMON *const cm, MACROBLOCKD *const xd,
const TileInfo *const tile, const TileInfo *const tile,
BLOCK_SIZE bsize, int mi_row, int mi_col) { BLOCK_SIZE bsize, int mi_row, int mi_col) {
const int bw = num_8x8_blocks_wide_lookup[bsize]; const int bw = num_8x8_blocks_wide_lookup[bsize];
const int bh = num_8x8_blocks_high_lookup[bsize]; const int bh = num_8x8_blocks_high_lookup[bsize];
const int x_mis = MIN(bw, cm->mi_cols - mi_col); const int x_mis = MIN(bw, cm->mi_cols - mi_col);
@@ -315,6 +315,7 @@ static void set_offsets(VP9_COMMON *const cm, MACROBLOCKD *const xd,
set_mi_row_col(xd, tile, mi_row, bh, mi_col, bw, cm->mi_rows, cm->mi_cols); set_mi_row_col(xd, tile, mi_row, bh, mi_col, bw, cm->mi_rows, cm->mi_cols);
vp9_setup_dst_planes(xd, get_frame_new_buffer(cm), mi_row, mi_col); vp9_setup_dst_planes(xd, get_frame_new_buffer(cm), mi_row, mi_col);
return &xd->mi[0]->mbmi;
} }
static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd, static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd,
@@ -335,17 +336,12 @@ static void decode_block(VP9_COMMON *const cm, MACROBLOCKD *const xd,
int mi_row, int mi_col, int mi_row, int mi_col,
vp9_reader *r, BLOCK_SIZE bsize) { vp9_reader *r, BLOCK_SIZE bsize) {
const int less8x8 = bsize < BLOCK_8X8; const int less8x8 = bsize < BLOCK_8X8;
MB_MODE_INFO *mbmi; MB_MODE_INFO *mbmi = set_offsets(cm, xd, tile, bsize, mi_row, mi_col);
set_offsets(cm, xd, tile, bsize, mi_row, mi_col);
vp9_read_mode_info(cm, xd, tile, mi_row, mi_col, r); vp9_read_mode_info(cm, xd, tile, mi_row, mi_col, r);
if (less8x8) if (less8x8)
bsize = BLOCK_8X8; bsize = BLOCK_8X8;
// Has to be called after set_offsets
mbmi = &xd->mi[0]->mbmi;
if (mbmi->skip) { if (mbmi->skip) {
reset_skip_context(xd, bsize); reset_skip_context(xd, bsize);
} else { } else {