diff options
| author | James Zern <jzern@google.com> | 2015-06-05 16:07:20 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-06-05 16:14:14 -0700 |
| commit | f82cfc2ee8544b2d9fb9474ecad16da57a3ae285 (patch) | |
| tree | 6abaa94bf7392126b95673297b14fbe4fe824b99 /vpxenc.c | |
| parent | 9c6eea35b6bb4c1243504a5d1c45c1c334110279 (diff) | |
| download | libvpx-f82cfc2ee8544b2d9fb9474ecad16da57a3ae285.tar libvpx-f82cfc2ee8544b2d9fb9474ecad16da57a3ae285.tar.gz libvpx-f82cfc2ee8544b2d9fb9474ecad16da57a3ae285.tar.bz2 libvpx-f82cfc2ee8544b2d9fb9474ecad16da57a3ae285.zip | |
vpxenc: relocate vp8/vp9 only options
move them under their respective config check to avoid some unused
variable warnings when disabled
Change-Id: Ic5e5280cf1bc1f56e8349676f0bedae4acef34ea
Diffstat (limited to 'vpxenc.c')
| -rw-r--r-- | vpxenc.c | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -330,10 +330,6 @@ static const arg_def_t sharpness = ARG_DEF( NULL, "sharpness", 1, "Loop filter sharpness (0..7)"); static const arg_def_t static_thresh = ARG_DEF( NULL, "static-thresh", 1, "Motion detection threshold"); -static const arg_def_t cpu_used_vp8 = ARG_DEF( - 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( NULL, "auto-alt-ref", 1, "Enable automatic alt reference frames"); static const arg_def_t arnr_maxframes = ARG_DEF( @@ -353,17 +349,14 @@ static const arg_def_t cq_level = ARG_DEF( NULL, "cq-level", 1, "Constant/Constrained Quality level"); static const arg_def_t max_intra_rate_pct = ARG_DEF( NULL, "max-intra-rate", 1, "Max I-frame bitrate (pct)"); -static const arg_def_t max_inter_rate_pct = ARG_DEF( - NULL, "max-inter-rate", 1, "Max P-frame bitrate (pct)"); -static const arg_def_t gf_cbr_boost_pct = ARG_DEF( - NULL, "gf-cbr-boost", 1, "Boost for Golden Frame in CBR mode (pct)"); - -static const arg_def_t screen_content_mode = ARG_DEF(NULL, "screen-content-mode", 1, - "Screen content mode"); #if CONFIG_VP8_ENCODER +static const arg_def_t cpu_used_vp8 = ARG_DEF( + NULL, "cpu-used", 1, "CPU Used (-16..16)"); static const arg_def_t token_parts = ARG_DEF( NULL, "token-parts", 1, "Number of token partitions to use, log2"); +static const arg_def_t screen_content_mode = ARG_DEF( + NULL, "screen-content-mode", 1, "Screen content mode"); static const arg_def_t *vp8_args[] = { &cpu_used_vp8, &auto_altref, &noise_sens, &sharpness, &static_thresh, &token_parts, &arnr_maxframes, &arnr_strength, &arnr_type, @@ -382,6 +375,8 @@ static const int vp8_arg_ctrl_map[] = { #endif #if CONFIG_VP9_ENCODER +static const arg_def_t cpu_used_vp9 = ARG_DEF( + NULL, "cpu-used", 1, "CPU Used (-8..8)"); static const arg_def_t tile_cols = ARG_DEF( NULL, "tile-columns", 1, "Number of tile columns to use, log2"); static const arg_def_t tile_rows = ARG_DEF( @@ -397,6 +392,10 @@ static const arg_def_t aq_mode = ARG_DEF( static const arg_def_t frame_periodic_boost = ARG_DEF( NULL, "frame-boost", 1, "Enable frame periodic boost (0: off (default), 1: on)"); +static const arg_def_t gf_cbr_boost_pct = ARG_DEF( + NULL, "gf-cbr-boost", 1, "Boost for Golden Frame in CBR mode (pct)"); +static const arg_def_t max_inter_rate_pct = ARG_DEF( + NULL, "max-inter-rate", 1, "Max P-frame bitrate (pct)"); static const struct arg_enum_list color_space_enum[] = { { "unknown", VPX_CS_UNKNOWN }, |