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 46 matching lines @@
     MODE_SECONDPASS     = 0x4,
     MODE_SECONDPASS_BEST = 0x5,
   } MODE;
 
   typedef enum {
     FRAMEFLAGS_KEY    = 1,
     FRAMEFLAGS_GOLDEN = 2,
     FRAMEFLAGS_ALTREF = 4,
   } FRAMETYPE_FLAGS;
 
+  typedef enum {
+    NO_AQ = 0,
+    VARIANCE_AQ = 1,
+    COMPLEXITY_AQ = 2,
+    AQ_MODES_COUNT  // This should always be the last member of the enum
+  } AQ_MODES;
+
   typedef struct {
     int version;  // 4 versions of bitstream defined:
                   //   0 - best quality/slowest decode,
                   //   3 - lowest quality/fastest decode
     int width;  // width of data passed to the compressor
     int height;  // height of data passed to the compressor
     double framerate;  // set to passed in framerate
     int64_t target_bandwidth;  // bandwidth to be used in kilobits per second
 
     int noise_sensitivity;  // pre processing blur: recommendation 0
@@ skipping 44 matching lines @@
     int64_t starting_buffer_level;  // in seconds
     int64_t optimal_buffer_level;
     int64_t maximum_buffer_size;
 
     // controlling quality
     int fixed_q;
     int worst_allowed_q;
     int best_allowed_q;
     int cq_level;
     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;
@@ skipping 37 matching lines @@
 
   void vp9_change_config(VP9_PTR onyx, VP9_CONFIG *oxcf);
 
   // receive a frames worth of data. caller can assume that a copy of this
   // frame is made and not just a copy of the pointer..
   int vp9_receive_raw_frame(VP9_PTR comp, unsigned int frame_flags,
                             YV12_BUFFER_CONFIG *sd, int64_t time_stamp,
                             int64_t end_time_stamp);
 
   int vp9_get_compressed_data(VP9_PTR comp, unsigned int *frame_flags,
-                              unsigned long *size, unsigned char *dest,
+                              size_t *size, uint8_t *dest,
                               int64_t *time_stamp, int64_t *time_end,
                               int flush);
 
   int vp9_get_preview_raw_frame(VP9_PTR comp, YV12_BUFFER_CONFIG *dest,
                                 vp9_ppflags_t *flags);
 
   int vp9_use_as_reference(VP9_PTR comp, int ref_frame_flags);
 
   int vp9_update_reference(VP9_PTR comp, int ref_frame_flags);
 
@@ skipping 15 matching lines @@
 
   int vp9_set_active_map(VP9_PTR comp, unsigned char *map,
                          unsigned int rows, unsigned int cols);
 
   int vp9_set_internal_size(VP9_PTR comp,
                             VPX_SCALING horiz_mode, VPX_SCALING vert_mode);
 
   int vp9_set_size_literal(VP9_PTR comp, unsigned int width,
                            unsigned int height);
 
-  int vp9_switch_layer(VP9_PTR comp, int layer);
-
   void vp9_set_svc(VP9_PTR comp, int use_svc);
 
   int vp9_get_quantizer(VP9_PTR c);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // VP9_COMMON_VP9_ONYX_H_