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

Remove inactive control parameters

Browse Source 
Change-Id: Ic5692af975fe6bd2d8ec82bbae103c6f7c2fc13e
This commit is contained in:
Jingning Han 2014-02-12 12:48:15 -08:00
parent 25479e94a4
commit 0eecccc51e
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_block.h
View File

@ -172,9 +172,7 @@ struct macroblock {
int skip_encode; int skip_encode;
// Used to store sub partition's choices. // Used to store sub partition's choices.
int fast_ms;
int_mv pred_mv[MAX_REF_FRAMES]; int_mv pred_mv[MAX_REF_FRAMES];
int subblock_ref;
// TODO(jingning): Need to refactor the structure arrays that buffers the // TODO(jingning): Need to refactor the structure arrays that buffers the
// coding mode decisions of each partition type. // coding mode decisions of each partition type.

12
vp9/encoder/vp9_encodeframe.c
View File

@ -1253,9 +1253,6 @@ static void rd_use_partition(VP9_COMP *cpi,
x->mb_energy = vp9_block_energy(cpi, x, bsize); x->mb_energy = vp9_block_energy(cpi, x, bsize);
} }
x->fast_ms = 0;
x->subblock_ref = 0;
if (cpi->sf.adjust_partitioning_from_last_frame) { if (cpi->sf.adjust_partitioning_from_last_frame) {
// Check if any of the sub blocks are further split. // Check if any of the sub blocks are further split.
if (partition == PARTITION_SPLIT && subsize > BLOCK_8X8) { if (partition == PARTITION_SPLIT && subsize > BLOCK_8X8) {
@ -1796,9 +1793,6 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
restore_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize); restore_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize);
} }
x->fast_ms = 0;
x->subblock_ref = 0;
// PARTITION_HORZ // PARTITION_HORZ
if (partition_horz_allowed && do_rect) { if (partition_horz_allowed && do_rect) {
subsize = get_subsize(bsize, PARTITION_HORZ); subsize = get_subsize(bsize, PARTITION_HORZ);
@ -2220,6 +2214,7 @@ static void select_tx_mode(VP9_COMP *cpi) {
} }
} }
} }
// Start RTC Exploration // Start RTC Exploration
typedef enum { typedef enum {
BOTH_ZERO = 0, BOTH_ZERO = 0,
@ -2251,12 +2246,15 @@ static void set_mode_info(MB_MODE_INFO *mbmi, BLOCK_SIZE bsize,
mbmi->sb_type = bsize; mbmi->sb_type = bsize;
mbmi->segment_id = 0; mbmi->segment_id = 0;
} }
static INLINE int get_block_row(int b32i, int b16i, int b8i) { static INLINE int get_block_row(int b32i, int b16i, int b8i) {
return ((b32i >> 1) << 2) + ((b16i >> 1) << 1) + (b8i >> 1); return ((b32i >> 1) << 2) + ((b16i >> 1) << 1) + (b8i >> 1);
} }
static INLINE int get_block_col(int b32i, int b16i, int b8i) { static INLINE int get_block_col(int b32i, int b16i, int b8i) {
return ((b32i & 1) << 2) + ((b16i & 1) << 1) + (b8i & 1); return ((b32i & 1) << 2) + ((b16i & 1) << 1) + (b8i & 1);
} }
static void rtc_use_partition(VP9_COMP *cpi, static void rtc_use_partition(VP9_COMP *cpi,
const TileInfo *const tile, const TileInfo *const tile,
MODE_INFO **mi_8x8, MODE_INFO **mi_8x8,
@ -2276,8 +2274,6 @@ static void rtc_use_partition(VP9_COMP *cpi,
int row8x8_remaining = tile->mi_row_end - mi_row; int row8x8_remaining = tile->mi_row_end - mi_row;
int col8x8_remaining = tile->mi_col_end - mi_col; int col8x8_remaining = tile->mi_col_end - mi_col;
int b32i; int b32i;
x->fast_ms = 0;
x->subblock_ref = 0;
for (b32i = 0; b32i < 4; b32i++) { for (b32i = 0; b32i < 4; b32i++) {
int b16i; int b16i;
for (b16i = 0; b16i < 4; b16i++) { for (b16i = 0; b16i < 4; b16i++) {

32
vp9/encoder/vp9_rdopt.c
View File

@ -2380,24 +2380,16 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
vp9_set_mv_search_range(x, &ref_mv.as_mv); vp9_set_mv_search_range(x, &ref_mv.as_mv);
// Adjust search parameters based on small partitions' result. // Work out the size of the first step in the mv step search.
if (x->fast_ms) { // 0 here is maximum length first step. 1 is MAX >> 1 etc.
// adjust search range if (cpi->sf.auto_mv_step_size && cpi->common.show_frame) {
step_param = 6; // Take wtd average of the step_params based on the last frame's
if (x->fast_ms > 1) // max mv magnitude and that based on the best ref mvs of the current
step_param = 8; // block for the given reference.
step_param = (vp9_init_search_range(cpi, x->max_mv_context[ref]) +
cpi->mv_step_param) >> 1;
} else { } else {
// Work out the size of the first step in the mv step search. step_param = cpi->mv_step_param;
// 0 here is maximum length first step. 1 is MAX >> 1 etc.
if (cpi->sf.auto_mv_step_size && cpi->common.show_frame) {
// Take wtd average of the step_params based on the last frame's
// max mv magnitude and that based on the best ref mvs of the current
// block for the given reference.
step_param = (vp9_init_search_range(cpi, x->max_mv_context[ref]) +
cpi->mv_step_param) >> 1;
} else {
step_param = cpi->mv_step_param;
}
} }
if (cpi->sf.adaptive_motion_search && bsize < BLOCK_64X64 && if (cpi->sf.adaptive_motion_search && bsize < BLOCK_64X64 &&
@ -3260,12 +3252,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
vp9_segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME)) vp9_segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME))
continue; continue;
// Skip some checking based on small partitions' result.
if (x->fast_ms > 1 && !ref_frame)
continue;
if (x->fast_ms > 2 && ref_frame != x->subblock_ref)
continue;
mbmi->ref_frame[0] = ref_frame; mbmi->ref_frame[0] = ref_frame;
mbmi->ref_frame[1] = second_ref_frame; mbmi->ref_frame[1] = second_ref_frame;