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

Require webm when explicitly requested

Browse Source 
https://code.google.com/p/webm/issues/detail?id=906

Change-Id: I72841078ff81152d21d84ccf4d5548e757685a6d
This commit is contained in:
Johann
2015-01-30 15:05:14 -08:00
committed by Gerrit Code Review
parent fd354b2e1e
commit b50e518ab6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vpxenc.c
View File

@@ -183,8 +183,10 @@ static const arg_def_t recontest = ARG_DEF_ENUM(
NULL, "test-decode", 1, "Test encode/decode mismatch", test_decode_enum); NULL, "test-decode", 1, "Test encode/decode mismatch", test_decode_enum);
static const arg_def_t framerate = ARG_DEF( static const arg_def_t framerate = ARG_DEF(
NULL, "fps", 1, "Stream frame rate (rate/scale)"); NULL, "fps", 1, "Stream frame rate (rate/scale)");
static const arg_def_t use_webm = ARG_DEF(
NULL, "webm", 0, "Output WebM (default when WebM IO is enabled)");
static const arg_def_t use_ivf = ARG_DEF( static const arg_def_t use_ivf = ARG_DEF(
NULL, "ivf", 0, "Output IVF (default is WebM if WebM IO is enabled)"); NULL, "ivf", 0, "Output IVF");
static const arg_def_t out_part = ARG_DEF( static const arg_def_t out_part = ARG_DEF(
"P", "output-partitions", 0, "P", "output-partitions", 0,
"Makes encoder output partitions. Requires IVF output!"); "Makes encoder output partitions. Requires IVF output!");
@@ -208,7 +210,7 @@ static const arg_def_t *main_args[] = {
&debugmode, &debugmode,
&outputfile, &codecarg, &passes, &pass_arg, &fpf_name, &limit, &skip, &outputfile, &codecarg, &passes, &pass_arg, &fpf_name, &limit, &skip,
&deadline, &best_dl, &good_dl, &rt_dl, &deadline, &best_dl, &good_dl, &rt_dl,
&quietarg, &verbosearg, &psnrarg, &use_ivf, &out_part, &q_hist_n, &quietarg, &verbosearg, &psnrarg, &use_webm, &use_ivf, &out_part, &q_hist_n,
&rate_hist_n, &disable_warnings, &disable_warning_prompt, &rate_hist_n, &disable_warnings, &disable_warning_prompt,
NULL NULL
}; };
@@ -1058,6 +1060,12 @@ static int parse_stream_params(struct VpxEncoderConfig *global,
#if CONFIG_FP_MB_STATS #if CONFIG_FP_MB_STATS
} else if (arg_match(&arg, &fpmbf_name, argi)) { } else if (arg_match(&arg, &fpmbf_name, argi)) {
config->fpmb_stats_fn = arg.val; config->fpmb_stats_fn = arg.val;
#endif
} else if (arg_match(&arg, &use_webm, argi)) {
#if CONFIG_WEBM_IO
config->write_webm = 1;
#else
die("Error: --webm specified but webm is disabled.");
#endif #endif
} else if (arg_match(&arg, &use_ivf, argi)) { } else if (arg_match(&arg, &use_ivf, argi)) {
config->write_webm = 0; config->write_webm = 0;