Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f990b35f
Commit
f990b35f
authored
Jun 01, 2015
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make vp9 the default codec for vpxenc
Change-Id: Ic3b4f3c9a6d8f9b04efb8b5ee080880895063564
parent
877fac12
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
CHANGELOG
CHANGELOG
+1
-0
vpxenc.c
vpxenc.c
+13
-4
No files found.
CHANGELOG
View file @
f990b35f
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.
2015-04-03 v1.4.0 "Indian Runner Duck"
...
...
vpxenc.c
View file @
f990b35f
...
...
@@ -469,6 +469,7 @@ static const arg_def_t *no_args[] = { NULL };
void
usage_exit
(
void
)
{
int
i
;
const
int
num_encoder
=
get_vpx_encoder_count
();
fprintf
(
stderr
,
"Usage: %s <options> -o dst_filename src_filename
\n
"
,
exec_name
);
...
...
@@ -496,11 +497,15 @@ void usage_exit(void) {
" in fractional seconds. Default is 1/1000.
\n
"
);
fprintf
(
stderr
,
"
\n
Included 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
);
fprintf
(
stderr
,
" %-6s - %s
\n
"
,
encoder
->
name
,
vpx_codec_iface_name
(
encoder
->
codec_interface
()));
const
char
*
defstr
=
(
i
==
(
num_encoder
-
1
))
?
"(default)"
:
""
;
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
);
}
...
...
@@ -811,10 +816,14 @@ static void validate_positive_rational(const char *msg,
static
void
parse_global_config
(
struct
VpxEncoderConfig
*
global
,
char
**
argv
)
{
char
**
argi
,
**
argj
;
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 */
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
->
color_type
=
I420
;
/* Assign default deadline to good quality */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment