diff options
| author | Alex Converse <aconverse@google.com> | 2014-08-11 15:47:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-11 15:47:58 -0700 |
| commit | 2402aba1df275afacf1e18e7e4ac46821f04fef9 (patch) | |
| tree | 4b707934de7dc7fc723ed69e1b3da8c9fdd1d4d4 | |
| parent | 136a022d71c78b9e2717163d9078970e548d9612 (diff) | |
| parent | 219f645b2d0c536d5b0e9ee354ec08f90ba6766e (diff) | |
| download | libvpx-2402aba1df275afacf1e18e7e4ac46821f04fef9.tar libvpx-2402aba1df275afacf1e18e7e4ac46821f04fef9.tar.gz libvpx-2402aba1df275afacf1e18e7e4ac46821f04fef9.tar.bz2 libvpx-2402aba1df275afacf1e18e7e4ac46821f04fef9.zip | |
Merge "Add tune-content command line option"
| -rw-r--r-- | vpxenc.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -378,11 +378,20 @@ 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 struct arg_enum_list tune_content_enum[] = { + {"default", VP9E_CONTENT_DEFAULT}, + {"screen", VP9E_CONTENT_SCREEN}, + {NULL, 0} +}; + +static const arg_def_t tune_content = ARG_DEF_ENUM( + NULL, "tune-content", 1, "Tune content type", tune_content_enum); + static const arg_def_t *vp9_args[] = { &cpu_used, &auto_altref, &noise_sens, &sharpness, &static_thresh, &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type, &tune_ssim, &cq_level, &max_intra_rate_pct, &lossless, - &frame_parallel_decoding, &aq_mode, &frame_periodic_boost, + &frame_parallel_decoding, &aq_mode, &frame_periodic_boost, &tune_content, NULL }; static const int vp9_arg_ctrl_map[] = { @@ -392,7 +401,7 @@ static const int vp9_arg_ctrl_map[] = { VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE, VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT, VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE, - VP9E_SET_FRAME_PERIODIC_BOOST, + VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_TUNE_CONTENT, 0 }; #endif |