Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: source/libvpx/vpxenc.c

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vpx_scale/yv12config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vpxenc.c
===================================================================
--- source/libvpx/vpxenc.c (revision 219822)
+++ source/libvpx/vpxenc.c (working copy)
@@ -1688,8 +1688,10 @@
/* Initialize default parameters */
memset(global, 0, sizeof(*global));
global->codec = codecs;
- global->passes = 1;
+ global->passes = 0;
global->use_i420 = 1;
+ /* Assign default deadline to good quality */
+ global->deadline = VPX_DL_GOOD_QUALITY;
for (argi = argj = argv; (*argj = *argi); argi += arg.argv_step) {
arg.argv_step = 1;
@@ -1761,6 +1763,11 @@
}
/* Validate global config */
+ if (global->passes == 0) {
+ // Make default VP9 passes = 2 until there is a better quality 1-pass
+ // encoder
+ global->passes = (global->codec->iface == vpx_codec_vp9_cx ? 2 : 1);
+ }
if (global->pass) {
/* DWIM: Assume the user meant passes=2 if pass=2 is specified */
@@ -2631,8 +2638,8 @@
&global.framerate));
}
+ FOREACH_STREAM(setup_pass(stream, &global, pass));
FOREACH_STREAM(open_output_file(stream, &global));
- FOREACH_STREAM(setup_pass(stream, &global, pass));
FOREACH_STREAM(initialize_encoder(stream, &global));
frame_avail = 1;
« no previous file with comments | « source/libvpx/vpx_scale/yv12config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698