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

Merge "Add no_skip_block4x4_search flag in SPLITMV mode"

Browse Source
This commit is contained in:
Yunqing Wang 2011-01-11 08:34:24 -08:00 committed by Code Review
commit 6ff2b0883a
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp8/encoder/onyx_if.c
View File

@ -592,6 +592,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
sf->iterative_sub_pixel = 1; sf->iterative_sub_pixel = 1;
sf->optimize_coefficients = 1; sf->optimize_coefficients = 1;
sf->use_fastquant_for_pick = 0; sf->use_fastquant_for_pick = 0;
sf->no_skip_block4x4_search = 1;
sf->first_step = 0; sf->first_step = 0;
sf->max_step_search_steps = MAX_MVSEARCH_STEPS; sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
@ -794,6 +795,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
sf->first_step = 1; sf->first_step = 1;
sf->max_step_search_steps = MAX_MVSEARCH_STEPS; sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
sf->no_skip_block4x4_search = 0;
} }
if (Speed > 1) if (Speed > 1)

1
vp8/encoder/onyx_int.h
View File

@ -183,6 +183,7 @@ typedef struct
int optimize_coefficients; int optimize_coefficients;
int use_fastquant_for_pick; int use_fastquant_for_pick;
int no_skip_block4x4_search;
} SPEED_FEATURES; } SPEED_FEATURES;

3
vp8/encoder/rdopt.c
View File

@ -1375,7 +1375,8 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x,
} }
/* If 8x8 is better than 16x8/8x16, then do 4x4 search */ /* If 8x8 is better than 16x8/8x16, then do 4x4 search */
if (bsi.segment_num == BLOCK_8X8) /* || (sv_segment_rd8x8-bsi.segment_rd) < sv_segment_rd8x8>>5) */ /* Not skip 4x4 if speed=0 (good quality) */
if (cpi->sf.no_skip_block4x4_search || bsi.segment_num == BLOCK_8X8) /* || (sv_segment_rd8x8-bsi.segment_rd) < sv_segment_rd8x8>>5) */
{ {
bsi.mvp = &bsi.sv_mvp[0]; bsi.mvp = &bsi.sv_mvp[0];
vp8_rd_check_segment(cpi, x, &bsi, BLOCK_4X4); vp8_rd_check_segment(cpi, x, &bsi, BLOCK_4X4);