Commit f990b35f authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Make vp9 the default codec for vpxenc

Change-Id: Ic3b4f3c9a6d8f9b04efb8b5ee080880895063564
parent 877fac12
xxxx-yy-zz v1.4.0 "Changes for next release" xxxx-yy-zz v1.4.0 "Changes for next release"
vpxenc is changed to use VP9 by default.
Encoder controls added for 1 pass SVC. Encoder controls added for 1 pass SVC.
2015-04-03 v1.4.0 "Indian Runner Duck" 2015-04-03 v1.4.0 "Indian Runner Duck"
......
...@@ -469,6 +469,7 @@ static const arg_def_t *no_args[] = { NULL }; ...@@ -469,6 +469,7 @@ static const arg_def_t *no_args[] = { NULL };
void usage_exit(void) { void usage_exit(void) {
int i; int i;
const int num_encoder = get_vpx_encoder_count();
fprintf(stderr, "Usage: %s <options> -o dst_filename src_filename \n", fprintf(stderr, "Usage: %s <options> -o dst_filename src_filename \n",
exec_name); exec_name);
...@@ -496,11 +497,15 @@ void usage_exit(void) { ...@@ -496,11 +497,15 @@ void usage_exit(void) {
" in fractional seconds. Default is 1/1000.\n"); " in fractional seconds. Default is 1/1000.\n");
fprintf(stderr, "\nIncluded encoders:\n\n"); fprintf(stderr, "\nIncluded encoders:\n\n");
for (i = 0; i < get_vpx_encoder_count(); ++i) { for (i = 0; i < num_encoder; ++i) {
const VpxInterface *const encoder = get_vpx_encoder_by_index(i); const VpxInterface *const encoder = get_vpx_encoder_by_index(i);
fprintf(stderr, " %-6s - %s\n", const char* defstr = (i == (num_encoder - 1)) ? "(default)" : "";
encoder->name, vpx_codec_iface_name(encoder->codec_interface())); fprintf(stderr, " %-6s - %s %s\n",
encoder->name, vpx_codec_iface_name(encoder->codec_interface()),
defstr);
} }
fprintf(stderr, "\n ");
fprintf(stderr, "Use --codec to switch to a non-default encoder.\n\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -811,10 +816,14 @@ static void validate_positive_rational(const char *msg, ...@@ -811,10 +816,14 @@ static void validate_positive_rational(const char *msg,
static void parse_global_config(struct VpxEncoderConfig *global, char **argv) { static void parse_global_config(struct VpxEncoderConfig *global, char **argv) {
char **argi, **argj; char **argi, **argj;
struct arg arg; struct arg arg;
const int num_encoder = get_vpx_encoder_count();
if (num_encoder < 1)
die("Error: no valid encoder available\n");
/* Initialize default parameters */ /* Initialize default parameters */
memset(global, 0, sizeof(*global)); memset(global, 0, sizeof(*global));
global->codec = get_vpx_encoder_by_index(0); global->codec = get_vpx_encoder_by_index(num_encoder - 1);
global->passes = 0; global->passes = 0;
global->color_type = I420; global->color_type = I420;
/* Assign default deadline to good quality */ /* Assign default deadline to good quality */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment