Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/include/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.
  */
 
@@ skipping 37 matching lines @@
      *
      *  Each encoder advertises the capabilities it supports as part of its
      *  ::vpx_codec_iface_t interface structure. Capabilities are extra
      *  interfaces or functionality, and are not required to be supported
      *  by an encoder.
      *
      *  The available flags are specified by VPX_CODEC_CAP_* defines.
      */
 #define VPX_CODEC_CAP_PSNR  0x10000 /**< Can issue PSNR packets */
 
-    /*! Can output one partition at a time. Each partition is returned in its
-     *  own VPX_CODEC_CX_FRAME_PKT, with the FRAME_IS_FRAGMENT flag set for
-     *  every partition but the last. In this mode all frames are always
-     *  returned partition by partition.
-     */
-#define VPX_CODEC_CAP_OUTPUT_PARTITION  0x20000
-
 
     /*! \brief Initialization-time Feature Enabling
      *
      *  Certain codec features must be known at initialization time, to allow
      *  for proper memory allocation.
      *
      *  The available flags are specified by VPX_CODEC_USE_* defines.
      */
 #define VPX_CODEC_USE_PSNR  0x10000 /**< Calculate PSNR on each frame */
-#define VPX_CODEC_USE_OUTPUT_PARTITION  0x20000 /**< Make the encoder output one
-                                                     partition at a time. */
 
 
     /*!\brief Generic fixed size buffer structure
      *
      * This structure is able to hold a reference to any fixed size buffer.
      */
     typedef struct vpx_fixed_buf
     {
         void          *buf; /**< Pointer to the data */
         size_t         sz;  /**< Length of the buffer, in chars */
@@ skipping 15 matching lines @@
      * can be used by an algorithm to provide additional detail, for example to
      * support frame types that are codec specific (MPEG-1 D-frames for example)
      */
     typedef uint32_t vpx_codec_frame_flags_t;
 #define VPX_FRAME_IS_KEY       0x1 /**< frame is the start of a GOP */
 #define VPX_FRAME_IS_DROPPABLE 0x2 /**< frame can be dropped without affecting
     the stream (no future frame depends on
                 this one) */
 #define VPX_FRAME_IS_INVISIBLE 0x4 /**< frame should be decoded but will not
     be shown */
-#define VPX_FRAME_IS_FRAGMENT  0x8 /**< this is a fragment of the encoded
-    frame */
 
-    /*!\brief Error Resilient flags
-     *
-     * These flags define which error resilient features to enable in the
-     * encoder. The flags are specified through the
-     * vpx_codec_enc_cfg::g_error_resilient variable.
-     */
-    typedef uint32_t vpx_codec_er_flags_t;
-#define VPX_ERROR_RESILIENT_DEFAULT     0x1 /**< Improve resiliency against
-                                                 losses of whole frames */
-#define VPX_ERROR_RESILIENT_PARTITIONS  0x2 /**< The frame partitions are
-                                                 independently decodable by the
-                                                 bool decoder, meaning that
-                                                 partitions can be decoded even
-                                                 though earlier partitions have
-                                                 been lost. Note that intra
-                                                 predicition is still done over
-                                                 the partition boundary. */
 
     /*!\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 */
@@ skipping 15 matching lines @@
         {
             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_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 */
 
@@ skipping 134 matching lines @@
          * the \ref RECOMMENDED method is to set the timebase to the reciprocal
          * of the frame rate (ex: 1001/30000 for 29.970 Hz NTSC). This allows the
          * pts to correspond to the frame number, which can be handy. For
          * re-encoding video from containers with absolute time timestamps, the
          * \ref RECOMMENDED method is to set the timebase to that of the parent
          * container or multimedia framework (ex: 1/1000 for ms, as in FLV).
          */
         struct vpx_rational    g_timebase;
 
 
-        /*!\brief Enable error resilient modes.
+        /*!\brief Enable error resilient mode.
          *
-         * The error resilient bitfield indicates to the encoder which features
-         * it should enable to take measures for streaming over lossy or noisy
-         * links.
+         * Error resilient mode indicates to the encoder that it should take
+         * measures appropriate for streaming over lossy or noisy links, if
+         * possible. Set to 1 to enable this feature, 0 to disable it.
          */
-        vpx_codec_er_flags_t   g_error_resilient;
+        unsigned int           g_error_resilient;
 
 
         /*!\brief Multi-pass Encoding Mode
          *
          * This value should be set to the current phase for multi-pass encoding.
          * For single pass, set to #VPX_RC_ONE_PASS.
          */
         enum vpx_enc_pass      g_pass;
 
 
@@ skipping 114 matching lines @@
          * vpx_codec_enc_config_default() with a usage value of 0.
          */
         unsigned int           rc_max_quantizer;
 
 
         /*
          * bitrate tolerance
          */
 
 
-        /*!\brief Rate control adaptation undershoot control
+        /*!\brief Rate control undershoot tolerance
          *
-         * This value, expressed as a percentage of the target bitrate,
-         * controls the maximum allowed adaptation speed of the codec.
-         * This factor controls the maximum amount of bits that can
-         * be subtracted from the target bitrate in order to compensate
-         * for prior overshoot.
-         *
-         * Valid values in the range 0-1000.
+         * This value, expressed as a percentage of the target bitrate, describes
+         * the target bitrate for easier frames, allowing bits to be saved for
+         * harder frames. Set to zero to use the codec default.
          */
         unsigned int           rc_undershoot_pct;
 
 
-        /*!\brief Rate control adaptation overshoot control
+        /*!\brief Rate control overshoot tolerance
          *
-         * This value, expressed as a percentage of the target bitrate,
-         * controls the maximum allowed adaptation speed of the codec.
-         * This factor controls the maximum amount of bits that can
-         * be added to the target bitrate in order to compensate for
-         * prior undershoot.
-         *
-         * Valid values in the range 0-1000.
+         * This value, expressed as a percentage of the target bitrate, describes
+         * the maximum allowed bitrate for a given frame.  Set to zero to use the
+         * codec default.
          */
         unsigned int           rc_overshoot_pct;
 
 
         /*
          * decoder buffer model parameters
          */
 
 
         /*!\brief Decoder Buffer Size
@@ skipping 328 matching lines @@
      */
     const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t   *ctx);
 
 
     /*!@} - end defgroup encoder*/
 
 #endif
 #ifdef __cplusplus
 }
 #endif