libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.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.
  */
 #ifndef VPX_VPX_ENCODER_H_
@@ skipping 137 matching lines @@
 
   /*!\brief Encoder output packet variants
    *
    * This enumeration lists the different kinds of data packets that can be
    * returned by calls to vpx_codec_get_cx_data(). Algorithms \ref MAY
    * extend this list to provide additional functionality.
    */
   enum vpx_codec_cx_pkt_kind {
     VPX_CODEC_CX_FRAME_PKT,    /**< Compressed video frame */
     VPX_CODEC_STATS_PKT,       /**< Two-pass statistics for this frame */
+    VPX_CODEC_FPMB_STATS_PKT,  /**< first pass mb statistics for this frame */
     VPX_CODEC_PSNR_PKT,        /**< PSNR statistics for this frame */
+#ifdef CONFIG_SPATIAL_SVC
+    VPX_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/
+#endif
     VPX_CODEC_CUSTOM_PKT = 256 /**< Algorithm extensions  */
   };
 
 
   /*!\brief Encoder output packet
    *
    * This structure contains the different kinds of output data the encoder
    * may produce while compressing a frame.
    */
   typedef struct vpx_codec_cx_pkt {
     enum vpx_codec_cx_pkt_kind  kind; /**< packet variant */
     union {
       struct {
         void                    *buf;      /**< compressed data buffer */
         size_t                   sz;       /**< length of compressed data */
         vpx_codec_pts_t          pts;      /**< time stamp to show frame
                                                     (in timebase units) */
         unsigned long            duration; /**< duration to show frame
                                                     (in timebase units) */
         vpx_codec_frame_flags_t  flags;    /**< flags for this frame */
         int                      partition_id; /**< the partition id
                                               defines the decoding order
                                               of the partitions. Only
                                               applicable when "output partition"
                                               mode is enabled. First partition
                                               has id 0.*/
 
       } frame;  /**< data for compressed frame packet */
       struct vpx_fixed_buf twopass_stats;  /**< data for two-pass packet */
+      struct vpx_fixed_buf firstpass_mb_stats; /**< first pass mb packet */
       struct vpx_psnr_pkt {
         unsigned int samples[4];  /**< Number of samples, total/y/u/v */
         uint64_t     sse[4];      /**< sum squared error, total/y/u/v */
         double       psnr[4];     /**< PSNR, total/y/u/v */
       } psnr;                       /**< data for PSNR packet */
       struct vpx_fixed_buf raw;     /**< data for arbitrary packets */
+#ifdef CONFIG_SPATIAL_SVC
+      size_t layer_sizes[VPX_SS_MAX_LAYERS];
+#endif
 
       /* This packet size is fixed to allow codecs to extend this
        * interface without having to manage storage for raw packets,
        * i.e., if it's smaller than 128 bytes, you can store in the
        * packet list directly.
        */
       char pad[128 - sizeof(enum vpx_codec_cx_pkt_kind)]; /**< fixed sz */
     } data; /**< packet data */
   } vpx_codec_cx_pkt_t; /**< alias for struct vpx_codec_cx_pkt */
 
@@ skipping 235 matching lines @@
     enum vpx_rc_mode       rc_end_usage;
 
 
     /*!\brief Two-pass stats buffer.
      *
      * A buffer containing all of the stats packets produced in the first
      * pass, concatenated.
      */
     struct vpx_fixed_buf   rc_twopass_stats_in;
 
+    /*!\brief first pass mb stats buffer.
+     *
+     * A buffer containing all of the first pass mb stats packets produced
+     * in the first pass, concatenated.
+     */
+    struct vpx_fixed_buf   rc_firstpass_mb_stats_in;
 
     /*!\brief Target data rate
      *
      * Target bandwidth to use for this stream, in kilobits per second.
      */
     unsigned int           rc_target_bitrate;
 
 
     /*
      * quantizer settings
@@ skipping 157 matching lines @@
     /*
      * Spatial scalability settings (ss)
      */
 
     /*!\brief Number of spatial coding layers.
      *
      * This value specifies the number of spatial coding layers to be used.
      */
     unsigned int           ss_number_layers;
 
+#ifdef CONFIG_SPATIAL_SVC
+    /*!\brief Enable auto alt reference flags for each spatial layer.
+     *
+     * These values specify if auto alt reference frame is enabled for each
+     * spatial layer.
+     */
+    int                    ss_enable_auto_alt_ref[VPX_SS_MAX_LAYERS];
+#endif
+
     /*!\brief Target bitrate for each spatial layer.
      *
      * These values specify the target coding bitrate to be used for each
      * spatial layer.
      */
     unsigned int           ss_target_bitrate[VPX_SS_MAX_LAYERS];
 
     /*!\brief Number of temporal coding layers.
      *
      * This value specifies the number of temporal layers to be used.
@@ skipping 312 matching lines @@
    */
   const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t   *ctx);
 
 
   /*!@} - end defgroup encoder*/
 #ifdef __cplusplus
 }
 #endif
 #endif  // VPX_VPX_ENCODER_H_