Commit f0ab155e authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Use b_width_log2_ in partition type parse" into experimental

parents f07602e4 3819f11b
...@@ -873,8 +873,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc, ...@@ -873,8 +873,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
MACROBLOCKD *xd = &cpi->mb.e_mbd; MACROBLOCKD *xd = &cpi->mb.e_mbd;
const int mis = cm->mode_info_stride; const int mis = cm->mode_info_stride;
int bwl, bhl; int bwl, bhl;
int bw, bh; int bsl = b_width_log2(bsize);
int bsl = mi_width_log2(bsize), bs = (1 << bsl) / 2; int bs = (1 << bsl) / 4; // mode_info step for subsize
int n; int n;
PARTITION_TYPE partition; PARTITION_TYPE partition;
BLOCK_SIZE_TYPE subsize; BLOCK_SIZE_TYPE subsize;
...@@ -882,10 +882,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc, ...@@ -882,10 +882,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
return; return;
bwl = mi_width_log2(m->mbmi.sb_type); bwl = b_width_log2(m->mbmi.sb_type);
bhl = mi_height_log2(m->mbmi.sb_type); bhl = b_height_log2(m->mbmi.sb_type);
bw = 1 << bwl;
bh = 1 << bhl;
// parse the partition type // parse the partition type
if ((bwl == bsl) && (bhl == bsl)) if ((bwl == bsl) && (bhl == bsl))
...@@ -900,8 +898,6 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc, ...@@ -900,8 +898,6 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
assert(0); assert(0);
#if CONFIG_AB4X4 #if CONFIG_AB4X4
if (bsize == BLOCK_SIZE_SB8X8 && m->mbmi.sb_type < BLOCK_SIZE_SB8X8)
partition = PARTITION_SPLIT;
if (bsize < BLOCK_SIZE_SB8X8) if (bsize < BLOCK_SIZE_SB8X8)
if (xd->ab_index != 0) if (xd->ab_index != 0)
return; return;
...@@ -929,13 +925,13 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc, ...@@ -929,13 +925,13 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col); write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col);
if ((mi_row + bh) < cm->mi_rows) if ((mi_row + bs) < cm->mi_rows)
write_modes_b(cpi, m + bh * mis, bc, tok, tok_end, mi_row + bh, mi_col); write_modes_b(cpi, m + bs * mis, bc, tok, tok_end, mi_row + bs, mi_col);
break; break;
case PARTITION_VERT: case PARTITION_VERT:
write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col); write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col);
if ((mi_col + bw) < cm->mi_cols) if ((mi_col + bs) < cm->mi_cols)
write_modes_b(cpi, m + bw, bc, tok, tok_end, mi_row, mi_col + bw); write_modes_b(cpi, m + bs, bc, tok, tok_end, mi_row, mi_col + bs);
break; break;
case PARTITION_SPLIT: case PARTITION_SPLIT:
for (n = 0; n < 4; n++) { for (n = 0; n < 4; n++) {
......
Supports Markdown
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