libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_onyx.h

 /*
  *  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 37 matching lines @@
     USAGE_CONSTANT_QUALITY      = 0x3,
   } END_USAGE;
 
 
   typedef enum {
     MODE_GOODQUALITY    = 0x1,
     MODE_BESTQUALITY    = 0x2,
     MODE_FIRSTPASS      = 0x3,
     MODE_SECONDPASS     = 0x4,
     MODE_SECONDPASS_BEST = 0x5,
+    MODE_REALTIME       = 0x6,
   } MODE;
 
   typedef enum {
     FRAMEFLAGS_KEY    = 1,
     FRAMEFLAGS_GOLDEN = 2,
     FRAMEFLAGS_ALTREF = 4,
   } FRAMETYPE_FLAGS;
 
   typedef enum {
     NO_AQ = 0,
@@ skipping 71 matching lines @@
     int lossless;
     int aq_mode;  // Adaptive Quantization mode
 
     // two pass datarate control
     int two_pass_vbrbias;        // two pass datarate control tweaks
     int two_pass_vbrmin_section;
     int two_pass_vbrmax_section;
     // END DATARATE CONTROL OPTIONS
     // ----------------------------------------------------------------
 
-    // Spatial scalability
-    int ss_number_layers;
+    // Spatial and temporal scalability.
+    int ss_number_layers;  // Number of spatial layers.
+    int ts_number_layers;  // Number of temporal layers.
+    // Bitrate allocation (CBR mode) and framerate factor, for temporal layers.
+    int ts_target_bitrate[VPX_TS_MAX_LAYERS];
+    int ts_rate_decimator[VPX_TS_MAX_LAYERS];
 
     // these parameters aren't to be used in final build don't use!!!
     int play_alternate;
     int alt_freq;
 
     int encode_breakout;  // early breakout : for video conf recommend 800
 
     /* Bitfield defining the error resiliency features to enable.
      * Can provide decodable frames after losses in previous
      * frames and decodable partitions after losses in the same frame.
@@ skipping 72 matching lines @@
 
   void vp9_set_svc(VP9_PTR comp, int use_svc);
 
   int vp9_get_quantizer(VP9_PTR c);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP9_COMMON_VP9_ONYX_H_