libvpx: Pull from upstream

source/libvpx/vpxenc.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1670 matching lines @@
 }
 
 
 static void parse_global_config(struct global_config *global, char **argv) {
   char       **argi, **argj;
   struct arg   arg;
 
   /* 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;
 
     if (arg_match(&arg, &codecarg, argi)) {
       int j, k = -1;
 
       for (j = 0; j < sizeof(codecs) / sizeof(codecs[0]); j++)
         if (!strcmp(codecs[j].name, arg.val))
           k = j;
@@ skipping 51 matching lines @@
       global->debug = 1;
     else if (arg_match(&arg, &q_hist_n, argi))
       global->show_q_hist_buckets = arg_parse_uint(&arg);
     else if (arg_match(&arg, &rate_hist_n, argi))
       global->show_rate_hist_buckets = arg_parse_uint(&arg);
     else
       argj++;
   }
 
   /* 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 */
     if (global->pass > global->passes) {
       warn("Assuming --pass=%d implies --passes=%d\n",
            global->pass, global->pass);
       global->passes = global->pass;
     }
   }
 }
@@ skipping 850 matching lines @@
         vpx_img_alloc(&raw,
                       input.use_i420 ? VPX_IMG_FMT_I420
                       : VPX_IMG_FMT_YV12,
                       input.w, input.h, 32);
 
       FOREACH_STREAM(init_rate_histogram(&stream->rate_hist,
                                          &stream->config.cfg,
                                          &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;
     got_data = 0;
 
     while (frame_avail || got_data) {
       struct vpx_usec_timer timer;
 
       if (!global.limit || frames_in < global.limit) {
         frame_avail = read_frame(&input, &raw);
@@ skipping 138 matching lines @@
     }
     fclose(f);
   });
 #endif
 
   vpx_img_free(&raw);
   free(argv);
   free(streams);
   return res ? EXIT_FAILURE : EXIT_SUCCESS;
 }