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

Merge "Replace the call to set_offsets()"

Browse Source
This commit is contained in:
Yaowu Xu 2014-04-11 15:50:02 -07:00 committed by Gerrit Code Review
commit eb0c52baca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_encodeframe.c
View File

@ -1463,6 +1463,8 @@ static void set_source_var_based_partition(VP9_COMP *cpi,
int r, c; int r, c;
MODE_INFO *mi_upper_left = cm->mi + mi_row * mis + mi_col; MODE_INFO *mi_upper_left = cm->mi + mi_row * mis + mi_col;
vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);
assert((row8x8_remaining > 0) && (col8x8_remaining > 0)); assert((row8x8_remaining > 0) && (col8x8_remaining > 0));
// In-image SB64 // In-image SB64
@ -3193,7 +3195,6 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
1, &dummy_rate, &dummy_dist); 1, &dummy_rate, &dummy_dist);
break; break;
case SOURCE_VAR_BASED_PARTITION: case SOURCE_VAR_BASED_PARTITION:
set_offsets(cpi, tile, mi_row, mi_col, BLOCK_64X64);
set_source_var_based_partition(cpi, tile, mi_8x8, mi_row, mi_col); set_source_var_based_partition(cpi, tile, mi_8x8, mi_row, mi_col);
nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64, nonrd_use_partition(cpi, tile, mi_8x8, tp, mi_row, mi_col, BLOCK_64X64,
1, &dummy_rate, &dummy_dist); 1, &dummy_rate, &dummy_dist);