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

Syncing write_modes_{b, sb} implementation with decode_modes_{b, sb}.

Browse Source 
Change-Id: Iaee740ec3bfb2b5328c24f4641c285e5a4a046dc
This commit is contained in:
Dmitry Kovalev 2013-11-11 17:29:31 -08:00
parent 4e39d530f0
commit 3740d67d76
1 changed files with 49 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
vp9/encoder/vp9_bitstream.c
View File

@ -543,37 +543,33 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, MODE_INFO **mi_8x8,
} }
static void write_modes_b(VP9_COMP *cpi, const TileInfo *const tile, static void write_modes_b(VP9_COMP *cpi, const TileInfo *const tile,
MODE_INFO **mi_8x8, vp9_writer *bc, vp9_writer *w, TOKENEXTRA **tok, TOKENEXTRA *tok_end,
TOKENEXTRA **tok, TOKENEXTRA *tok_end, int mi_row, int mi_col) {
int mi_row, int mi_col, int index) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &cpi->mb.e_mbd; MACROBLOCKD *const xd = &cpi->mb.e_mbd;
MODE_INFO *m = mi_8x8[0]; MODE_INFO *m;
if (m->mbmi.sb_type < BLOCK_8X8) xd->mi_8x8 = cm->mi_grid_visible + (mi_row * cm->mode_info_stride + mi_col);
if (index > 0) m = xd->mi_8x8[0];
return;
xd->mi_8x8 = mi_8x8;
set_mi_row_col(xd, tile, set_mi_row_col(xd, tile,
mi_row, num_8x8_blocks_high_lookup[m->mbmi.sb_type], mi_row, num_8x8_blocks_high_lookup[m->mbmi.sb_type],
mi_col, num_8x8_blocks_wide_lookup[m->mbmi.sb_type], mi_col, num_8x8_blocks_wide_lookup[m->mbmi.sb_type],
cm->mi_rows, cm->mi_cols); cm->mi_rows, cm->mi_cols);
if (frame_is_intra_only(cm)) { if (frame_is_intra_only(cm)) {
write_mb_modes_kf(cpi, mi_8x8, bc); write_mb_modes_kf(cpi, xd->mi_8x8, w);
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
active_section = 8; active_section = 8;
#endif #endif
} else { } else {
pack_inter_mode_mvs(cpi, m, bc); pack_inter_mode_mvs(cpi, m, w);
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
active_section = 1; active_section = 1;
#endif #endif
} }
assert(*tok < tok_end); assert(*tok < tok_end);
pack_mb_tokens(bc, tok, tok_end); pack_mb_tokens(w, tok, tok_end);
} }
static void write_partition(VP9_COMP *cpi, int hbs, int mi_row, int mi_col, static void write_partition(VP9_COMP *cpi, int hbs, int mi_row, int mi_col,
@ -600,59 +596,50 @@ static void write_partition(VP9_COMP *cpi, int hbs, int mi_row, int mi_col,
} }
static void write_modes_sb(VP9_COMP *cpi, const TileInfo *const tile, static void write_modes_sb(VP9_COMP *cpi, const TileInfo *const tile,
MODE_INFO **mi_8x8, vp9_writer *bc, vp9_writer *w, TOKENEXTRA **tok, TOKENEXTRA *tok_end,
TOKENEXTRA **tok, TOKENEXTRA *tok_end, int mi_row, int mi_col, BLOCK_SIZE bsize) {
int mi_row, int mi_col, BLOCK_SIZE bsize,
int index) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
const int mis = cm->mode_info_stride; const int bsl = b_width_log2(bsize);
int bsl = b_width_log2(bsize); const int bs = (1 << bsl) / 4;
int bs = (1 << bsl) / 4; // mode_info step for subsize PARTITION_TYPE partition;
int n;
PARTITION_TYPE partition = PARTITION_NONE;
BLOCK_SIZE subsize; BLOCK_SIZE subsize;
MODE_INFO *m = mi_8x8[0]; MODE_INFO *m = cm->mi_grid_visible[mi_row * cm->mode_info_stride + mi_col];
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
return; return;
partition = partition_lookup[bsl][m->mbmi.sb_type]; partition = partition_lookup[bsl][m->mbmi.sb_type];
write_partition(cpi, bs, mi_row, mi_col, partition, bsize, w);
if (bsize < BLOCK_8X8) {
if (index > 0)
return;
} else {
write_partition(cpi, bs, mi_row, mi_col, partition, bsize, bc);
}
subsize = get_subsize(bsize, partition); subsize = get_subsize(bsize, partition);
if (subsize < BLOCK_8X8) {
switch (partition) { write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
case PARTITION_NONE: } else {
write_modes_b(cpi, tile, mi_8x8, bc, tok, tok_end, mi_row, mi_col, 0); switch (partition) {
break; case PARTITION_NONE:
case PARTITION_HORZ: write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
write_modes_b(cpi, tile, mi_8x8, bc, tok, tok_end, mi_row, mi_col, 0); break;
if ((mi_row + bs) < cm->mi_rows) case PARTITION_HORZ:
write_modes_b(cpi, tile, mi_8x8 + bs * mis, bc, tok, tok_end, write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
mi_row + bs, mi_col, 1); if (mi_row + bs < cm->mi_rows)
break; write_modes_b(cpi, tile, w, tok, tok_end, mi_row + bs, mi_col);
case PARTITION_VERT: break;
write_modes_b(cpi, tile, mi_8x8, bc, tok, tok_end, mi_row, mi_col, 0); case PARTITION_VERT:
if ((mi_col + bs) < cm->mi_cols) write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
write_modes_b(cpi, tile, mi_8x8 + bs, bc, tok, tok_end, if (mi_col + bs < cm->mi_cols)
mi_row, mi_col + bs, 1); write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col + bs);
break; break;
case PARTITION_SPLIT: case PARTITION_SPLIT:
for (n = 0; n < 4; n++) { write_modes_sb(cpi, tile, w, tok, tok_end, mi_row, mi_col, subsize);
const int j = n >> 1, i = n & 1; write_modes_sb(cpi, tile, w, tok, tok_end, mi_row, mi_col + bs,
write_modes_sb(cpi, tile, mi_8x8 + j * bs * mis + i * bs, bc, subsize);
tok, tok_end, write_modes_sb(cpi, tile, w, tok, tok_end, mi_row + bs, mi_col,
mi_row + j * bs, mi_col + i * bs, subsize, n); subsize);
} write_modes_sb(cpi, tile, w, tok, tok_end, mi_row + bs, mi_col + bs,
break; subsize);
default: break;
assert(0); default:
assert(0);
}
} }
// update partition context // update partition context
@ -663,25 +650,15 @@ static void write_modes_sb(VP9_COMP *cpi, const TileInfo *const tile,
} }
static void write_modes(VP9_COMP *cpi, const TileInfo *const tile, static void write_modes(VP9_COMP *cpi, const TileInfo *const tile,
vp9_writer* const bc, vp9_writer *w, TOKENEXTRA **tok, TOKENEXTRA *tok_end) {
TOKENEXTRA **tok, TOKENEXTRA *tok_end) {
VP9_COMMON *const cm = &cpi->common;
const int mis = cm->mode_info_stride;
int mi_row, mi_col; int mi_row, mi_col;
MODE_INFO **mi_8x8 = cm->mi_grid_visible;
MODE_INFO **m_8x8;
mi_8x8 += tile->mi_col_start + tile->mi_row_start * mis;
for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end; for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end;
mi_row += 8, mi_8x8 += 8 * mis) { mi_row += MI_BLOCK_SIZE) {
m_8x8 = mi_8x8; vp9_zero(cpi->left_seg_context);
vp9_zero(cpi->left_seg_context);
for (mi_col = tile->mi_col_start; mi_col < tile->mi_col_end; for (mi_col = tile->mi_col_start; mi_col < tile->mi_col_end;
mi_col += MI_BLOCK_SIZE, m_8x8 += MI_BLOCK_SIZE) { mi_col += MI_BLOCK_SIZE)
write_modes_sb(cpi, tile, m_8x8, bc, tok, tok_end, mi_row, mi_col, write_modes_sb(cpi, tile, w, tok, tok_end, mi_row, mi_col, BLOCK_64X64);
BLOCK_64X64, 0);
}
} }
} }