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

Merge "Fix block partition size in fill_mode_info_sb"

Browse Source
This commit is contained in:
Jingning Han 2015-02-10 10:49:03 -08:00 committed by Gerrit Code Review
commit f0eea5be2a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vp9/encoder/vp9_encodeframe.c
View File

@ -2810,11 +2810,12 @@ static void nonrd_pick_sb_modes(VP9_COMP *cpi,
static void fill_mode_info_sb(VP9_COMMON *cm, MACROBLOCK *x, static void fill_mode_info_sb(VP9_COMMON *cm, MACROBLOCK *x,
int mi_row, int mi_col, int mi_row, int mi_col,
BLOCK_SIZE bsize, BLOCK_SIZE subsize, BLOCK_SIZE bsize,
PC_TREE *pc_tree) { PC_TREE *pc_tree) {
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
int bsl = b_width_log2_lookup[bsize], hbs = (1 << bsl) / 4; int bsl = b_width_log2_lookup[bsize], hbs = (1 << bsl) / 4;
PARTITION_TYPE partition = pc_tree->partitioning; PARTITION_TYPE partition = pc_tree->partitioning;
BLOCK_SIZE subsize = get_subsize(bsize, partition);
assert(bsize >= BLOCK_8X8); assert(bsize >= BLOCK_8X8);
@ -2830,34 +2831,32 @@ static void fill_mode_info_sb(VP9_COMMON *cm, MACROBLOCK *x,
case PARTITION_VERT: case PARTITION_VERT:
set_mode_info_offsets(cm, xd, mi_row, mi_col); set_mode_info_offsets(cm, xd, mi_row, mi_col);
*(xd->mi[0].src_mi) = pc_tree->vertical[0].mic; *(xd->mi[0].src_mi) = pc_tree->vertical[0].mic;
duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col, bsize); duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col, subsize);
if (mi_col + hbs < cm->mi_cols) { if (mi_col + hbs < cm->mi_cols) {
set_mode_info_offsets(cm, xd, mi_row, mi_col + hbs); set_mode_info_offsets(cm, xd, mi_row, mi_col + hbs);
*(xd->mi[0].src_mi) = pc_tree->vertical[1].mic; *(xd->mi[0].src_mi) = pc_tree->vertical[1].mic;
duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col + hbs, bsize); duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col + hbs, subsize);
} }
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
set_mode_info_offsets(cm, xd, mi_row, mi_col); set_mode_info_offsets(cm, xd, mi_row, mi_col);
*(xd->mi[0].src_mi) = pc_tree->horizontal[0].mic; *(xd->mi[0].src_mi) = pc_tree->horizontal[0].mic;
duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col, bsize); duplicate_mode_info_in_sb(cm, xd, mi_row, mi_col, subsize);
if (mi_row + hbs < cm->mi_rows) { if (mi_row + hbs < cm->mi_rows) {
set_mode_info_offsets(cm, xd, mi_row + hbs, mi_col); set_mode_info_offsets(cm, xd, mi_row + hbs, mi_col);
*(xd->mi[0].src_mi) = pc_tree->horizontal[1].mic; *(xd->mi[0].src_mi) = pc_tree->horizontal[1].mic;
duplicate_mode_info_in_sb(cm, xd, mi_row + hbs, mi_col, bsize); duplicate_mode_info_in_sb(cm, xd, mi_row + hbs, mi_col, subsize);
} }
break; break;
case PARTITION_SPLIT: { case PARTITION_SPLIT: {
BLOCK_SIZE subsubsize = get_subsize(subsize, PARTITION_SPLIT); fill_mode_info_sb(cm, x, mi_row, mi_col, subsize, pc_tree->split[0]);
fill_mode_info_sb(cm, x, mi_row, mi_col, subsize,
subsubsize, pc_tree->split[0]);
fill_mode_info_sb(cm, x, mi_row, mi_col + hbs, subsize, fill_mode_info_sb(cm, x, mi_row, mi_col + hbs, subsize,
subsubsize, pc_tree->split[1]); pc_tree->split[1]);
fill_mode_info_sb(cm, x, mi_row + hbs, mi_col, subsize, fill_mode_info_sb(cm, x, mi_row + hbs, mi_col, subsize,
subsubsize, pc_tree->split[2]); pc_tree->split[2]);
fill_mode_info_sb(cm, x, mi_row + hbs, mi_col + hbs, subsize, fill_mode_info_sb(cm, x, mi_row + hbs, mi_col + hbs, subsize,
subsubsize, pc_tree->split[3]); pc_tree->split[3]);
break; break;
} }
default: default:
@ -3113,9 +3112,7 @@ static void nonrd_pick_partition(VP9_COMP *cpi, ThreadData *td,
} }
// update mode info array // update mode info array
subsize = get_subsize(bsize, pc_tree->partitioning); fill_mode_info_sb(cm, x, mi_row, mi_col, bsize, pc_tree);
fill_mode_info_sb(cm, x, mi_row, mi_col, bsize, subsize,
pc_tree);
if (best_rdc.rate < INT_MAX && best_rdc.dist < INT64_MAX && do_recon) { if (best_rdc.rate < INT_MAX && best_rdc.dist < INT64_MAX && do_recon) {
int output_enabled = (bsize == BLOCK_64X64); int output_enabled = (bsize == BLOCK_64X64);