Commit bae36d67 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Renaming decode_modes_{b, sb}."

parents a91467a0 90fed85c
...@@ -373,7 +373,7 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -373,7 +373,7 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd,
xd->corrupted |= ref_buffer->buf->corrupted; xd->corrupted |= ref_buffer->buf->corrupted;
} }
static void decode_modes_b(VP9_COMMON *const cm, MACROBLOCKD *const xd, static void decode_block(VP9_COMMON *const cm, MACROBLOCKD *const xd,
const TileInfo *const tile, const TileInfo *const tile,
int mi_row, int mi_col, int mi_row, int mi_col,
vp9_reader *r, BLOCK_SIZE bsize) { vp9_reader *r, BLOCK_SIZE bsize) {
...@@ -451,7 +451,7 @@ static PARTITION_TYPE read_partition(VP9_COMMON *cm, MACROBLOCKD *xd, int hbs, ...@@ -451,7 +451,7 @@ static PARTITION_TYPE read_partition(VP9_COMMON *cm, MACROBLOCKD *xd, int hbs,
return p; return p;
} }
static void decode_modes_sb(VP9_COMMON *const cm, MACROBLOCKD *const xd, static void decode_partition(VP9_COMMON *const cm, MACROBLOCKD *const xd,
const TileInfo *const tile, const TileInfo *const tile,
int mi_row, int mi_col, int mi_row, int mi_col,
vp9_reader* r, BLOCK_SIZE bsize) { vp9_reader* r, BLOCK_SIZE bsize) {
...@@ -465,27 +465,27 @@ static void decode_modes_sb(VP9_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -465,27 +465,27 @@ static void decode_modes_sb(VP9_COMMON *const cm, MACROBLOCKD *const xd,
partition = read_partition(cm, xd, hbs, mi_row, mi_col, bsize, r); partition = read_partition(cm, xd, hbs, mi_row, mi_col, bsize, r);
subsize = get_subsize(bsize, partition); subsize = get_subsize(bsize, partition);
if (subsize < BLOCK_8X8) { if (subsize < BLOCK_8X8) {
decode_modes_b(cm, xd, tile, mi_row, mi_col, r, subsize); decode_block(cm, xd, tile, mi_row, mi_col, r, subsize);
} else { } else {
switch (partition) { switch (partition) {
case PARTITION_NONE: case PARTITION_NONE:
decode_modes_b(cm, xd, tile, mi_row, mi_col, r, subsize); decode_block(cm, xd, tile, mi_row, mi_col, r, subsize);
break; break;
case PARTITION_HORZ: case PARTITION_HORZ:
decode_modes_b(cm, xd, tile, mi_row, mi_col, r, subsize); decode_block(cm, xd, tile, mi_row, mi_col, r, subsize);
if (mi_row + hbs < cm->mi_rows) if (mi_row + hbs < cm->mi_rows)
decode_modes_b(cm, xd, tile, mi_row + hbs, mi_col, r, subsize); decode_block(cm, xd, tile, mi_row + hbs, mi_col, r, subsize);
break; break;
case PARTITION_VERT: case PARTITION_VERT:
decode_modes_b(cm, xd, tile, mi_row, mi_col, r, subsize); decode_block(cm, xd, tile, mi_row, mi_col, r, subsize);
if (mi_col + hbs < cm->mi_cols) if (mi_col + hbs < cm->mi_cols)
decode_modes_b(cm, xd, tile, mi_row, mi_col + hbs, r, subsize); decode_block(cm, xd, tile, mi_row, mi_col + hbs, r, subsize);
break; break;
case PARTITION_SPLIT: case PARTITION_SPLIT:
decode_modes_sb(cm, xd, tile, mi_row, mi_col, r, subsize); decode_partition(cm, xd, tile, mi_row, mi_col, r, subsize);
decode_modes_sb(cm, xd, tile, mi_row, mi_col + hbs, r, subsize); decode_partition(cm, xd, tile, mi_row, mi_col + hbs, r, subsize);
decode_modes_sb(cm, xd, tile, mi_row + hbs, mi_col, r, subsize); decode_partition(cm, xd, tile, mi_row + hbs, mi_col, r, subsize);
decode_modes_sb(cm, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize); decode_partition(cm, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize);
break; break;
default: default:
assert(0 && "Invalid partition type"); assert(0 && "Invalid partition type");
...@@ -767,7 +767,7 @@ static void decode_tile(VP9D_COMP *pbi, const TileInfo *const tile, ...@@ -767,7 +767,7 @@ static void decode_tile(VP9D_COMP *pbi, const TileInfo *const tile,
vp9_zero(xd->left_seg_context); vp9_zero(xd->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) { mi_col += MI_BLOCK_SIZE) {
decode_modes_sb(cm, xd, tile, mi_row, mi_col, r, BLOCK_64X64); decode_partition(cm, xd, tile, mi_row, mi_col, r, BLOCK_64X64);
} }
if (pbi->do_loopfilter_inline) { if (pbi->do_loopfilter_inline) {
...@@ -929,7 +929,7 @@ static int tile_worker_hook(void *arg1, void *arg2) { ...@@ -929,7 +929,7 @@ static int tile_worker_hook(void *arg1, void *arg2) {
vp9_zero(tile_data->xd.left_seg_context); vp9_zero(tile_data->xd.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) { mi_col += MI_BLOCK_SIZE) {
decode_modes_sb(tile_data->cm, &tile_data->xd, tile, decode_partition(tile_data->cm, &tile_data->xd, tile,
mi_row, mi_col, &tile_data->bit_reader, BLOCK_64X64); mi_row, mi_col, &tile_data->bit_reader, BLOCK_64X64);
} }
} }
......
Markdown is supported
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