libvpx: Pull from upstream

source/libvpx/vpx/svc_context.h

 /*
  *  Copyright (c) 2013 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.
  */
 
 /**
  * SvcContext - input parameters and state to encode a multi-layered
  * spatial SVC frame
  */
 
 #ifndef VPX_SVC_CONTEXT_H_
 #define VPX_SVC_CONTEXT_H_
 
 #include "./vp8cx.h"
 #include "./vpx_encoder.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum SVC_ENCODING_MODE {
-  INTER_LAYER_PREDICTION_I,
-  ALT_INTER_LAYER_PREDICTION_IP,
-  INTER_LAYER_PREDICTION_IP,
-  USE_GOLDEN_FRAME
-} SVC_ENCODING_MODE;
-
 typedef enum SVC_LOG_LEVEL {
   SVC_LOG_ERROR,
   SVC_LOG_INFO,
   SVC_LOG_DEBUG
 } SVC_LOG_LEVEL;
 
 typedef struct {
   // public interface to svc_command options
   int spatial_layers;               // number of layers
-  SVC_ENCODING_MODE encoding_mode;  // svc encoding strategy
   SVC_LOG_LEVEL log_level;  // amount of information to display
   int log_print;  // when set, printf log messages instead of returning the
                   // message with svc_get_message
 
   // private storage for vpx_svc_encode
   void *internal;
 } SvcContext;
 
 /**
  * Set SVC options
  * options are supplied as a single string separated by spaces
  * Format: encoding-mode=<i|ip|alt-ip|gf>
  *         layers=<layer_count>
  *         scaling-factors=<n1>/<d1>,<n2>/<d2>,...
  *         quantizers=<q1>,<q2>,...
  */
 vpx_codec_err_t vpx_svc_set_options(SvcContext *svc_ctx, const char *options);
 
 /**
  * Set SVC quantizer values
  * values comma separated, ordered from lowest resolution to highest
  * e.g., "60,53,39,33,27"
  */
 vpx_codec_err_t vpx_svc_set_quantizers(SvcContext *svc_ctx,
-                                       const char *quantizer_values,
-                                       const int is_for_keyframe);
+                                       const char *quantizer_values);
 
 /**
  * Set SVC scale factors
  * values comma separated, ordered from lowest resolution to highest
  * e.g.,  "4/16,5/16,7/16,11/16,16/16"
  */
 vpx_codec_err_t vpx_svc_set_scale_factors(SvcContext *svc_ctx,
                                           const char *scale_factors);
 
 /**
@@ skipping 18 matching lines @@
  * dump accumulated statistics and reset accumulated values
  */
 const char *vpx_svc_dump_statistics(SvcContext *svc_ctx);
 
 /**
  *  get status message from previous encode
  */
 const char *vpx_svc_get_message(const SvcContext *svc_ctx);
 
 /**
- * return size of encoded data to be returned by vpx_svc_get_buffer
+ * return size of encoded data to be returned by vpx_svc_get_buffer.
+ * it needs to be called before vpx_svc_get_buffer.
  */
 size_t vpx_svc_get_frame_size(const SvcContext *svc_ctx);
 
 /**
- * return buffer with encoded data
+ * return buffer with encoded data. encoder will maintain a list of frame
+ * buffers. each call of vpx_svc_get_buffer() will return one frame.
  */
-void *vpx_svc_get_buffer(const SvcContext *svc_ctx);
+void *vpx_svc_get_buffer(SvcContext *svc_ctx);
 
 /**
  * return size of two pass rate control stats data to be returned by
  * vpx_svc_get_rc_stats_buffer
  */
 size_t vpx_svc_get_rc_stats_buffer_size(const SvcContext *svc_ctx);
 
 /**
  * return buffer two pass of rate control stats data
  */
@@ skipping 19 matching lines @@
 /**
  * force the next frame to be a keyframe
  */
 void vpx_svc_set_keyframe(SvcContext *svc_ctx);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VPX_SVC_CONTEXT_H_