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

Merge "Corrected value range of --cpu-used for vp9"

Browse Source
This commit is contained in:
Yaowu Xu 2014-12-17 17:12:14 -08:00 committed by Gerrit Code Review
commit 09b9a59fb5
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_speed_features.c
View File

@ -339,18 +339,10 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->mv.fullpel_search_step_param = 10; sf->mv.fullpel_search_step_param = 10;
sf->lpf_pick = LPF_PICK_MINIMAL_LPF; sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
} }
if (speed >= 8) {
if (speed >= 12) {
sf->adaptive_rd_thresh = 4; sf->adaptive_rd_thresh = 4;
sf->mv.subpel_force_stop = 2; sf->mv.subpel_force_stop = 2;
} }
if (speed >= 13) {
int i;
sf->max_intra_bsize = BLOCK_32X32;
for (i = 0; i < BLOCK_SIZES; ++i)
sf->inter_mode_mask[i] = INTER_NEAREST;
}
} }
void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) { void vp9_set_speed_features_framesize_dependent(VP9_COMP *cpi) {

2
vp9/vp9_cx_iface.c
View File

@ -208,7 +208,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
"or kf_max_dist instead."); "or kf_max_dist instead.");
RANGE_CHECK(extra_cfg, enable_auto_alt_ref, 0, 2); RANGE_CHECK(extra_cfg, enable_auto_alt_ref, 0, 2);
RANGE_CHECK(extra_cfg, cpu_used, -16, 16); RANGE_CHECK(extra_cfg, cpu_used, -8, 8);
RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6); RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6);
RANGE_CHECK(extra_cfg, tile_columns, 0, 6); RANGE_CHECK(extra_cfg, tile_columns, 0, 6);
RANGE_CHECK(extra_cfg, tile_rows, 0, 2); RANGE_CHECK(extra_cfg, tile_rows, 0, 2);

8
vpxenc.c
View File

@ -328,8 +328,10 @@ static const arg_def_t sharpness = ARG_DEF(
NULL, "sharpness", 1, "Loop filter sharpness (0..7)"); NULL, "sharpness", 1, "Loop filter sharpness (0..7)");
static const arg_def_t static_thresh = ARG_DEF( static const arg_def_t static_thresh = ARG_DEF(
NULL, "static-thresh", 1, "Motion detection threshold"); NULL, "static-thresh", 1, "Motion detection threshold");
static const arg_def_t cpu_used = ARG_DEF( static const arg_def_t cpu_used_vp8 = ARG_DEF(
NULL, "cpu-used", 1, "CPU Used (-16..16)"); NULL, "cpu-used", 1, "CPU Used (-16..16)");
static const arg_def_t cpu_used_vp9 = ARG_DEF(
NULL, "cpu-used", 1, "CPU Used (-8..8)");
static const arg_def_t auto_altref = ARG_DEF( static const arg_def_t auto_altref = ARG_DEF(
NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames"); NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames");
static const arg_def_t arnr_maxframes = ARG_DEF( static const arg_def_t arnr_maxframes = ARG_DEF(
@ -361,7 +363,7 @@ static const arg_def_t screen_content_mode = ARG_DEF(NULL, "screen-content-mode"
static const arg_def_t token_parts = ARG_DEF( static const arg_def_t token_parts = ARG_DEF(
NULL, "token-parts", 1, "Number of token partitions to use, log2"); NULL, "token-parts", 1, "Number of token partitions to use, log2");
static const arg_def_t *vp8_args[] = { static const arg_def_t *vp8_args[] = {
&cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh, &cpu_used_vp8, &auto_altref, &noise_sens, &sharpness, &static_thresh,
&token_parts, &arnr_maxframes, &arnr_strength, &arnr_type, &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type,
&tune_ssim, &cq_level, &max_intra_rate_pct, &screen_content_mode, &tune_ssim, &cq_level, &max_intra_rate_pct, &screen_content_mode,
NULL NULL
@ -420,7 +422,7 @@ static const arg_def_t tune_content = ARG_DEF_ENUM(
NULL, "tune-content", 1, "Tune content type", tune_content_enum); NULL, "tune-content", 1, "Tune content type", tune_content_enum);
static const arg_def_t *vp9_args[] = { static const arg_def_t *vp9_args[] = {
&cpu_used, &auto_altref, &sharpness, &static_thresh, &cpu_used_vp9, &auto_altref, &sharpness, &static_thresh,
&tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type, &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type,
&tune_ssim, &cq_level, &max_intra_rate_pct, &max_inter_rate_pct, &tune_ssim, &cq_level, &max_intra_rate_pct, &max_inter_rate_pct,
&gf_cbr_boost_pct, &lossless, &gf_cbr_boost_pct, &lossless,