libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_svc_layercontext.h

 /*
  *  Copyright (c) 2014 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 VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_
 #define VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_
 
 #include "vpx/vpx_encoder.h"
 
 #include "vp9/encoder/vp9_ratectrl.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct {
   RATE_CONTROL rc;
   int target_bandwidth;
   double framerate;
   int avg_frame_size;
   TWO_PASS twopass;
-  struct vpx_fixed_buf rc_twopass_stats_in;
+  vpx_fixed_buf_t rc_twopass_stats_in;
   unsigned int current_video_frame_in_layer;
   int is_key_frame;
+  int frames_from_key_frame;
+  FRAME_TYPE last_frame_type;
   vpx_svc_parameters_t svc_params_received;
   struct lookahead_entry  *alt_ref_source;
   int alt_ref_idx;
   int gold_ref_idx;
   int has_alt_frame;
   size_t layer_size;
 } LAYER_CONTEXT;
 
 typedef struct {
   int spatial_layer_id;
@@ skipping 32 matching lines @@
 // to be encoded, to the cpi struct.
 void vp9_restore_layer_context(struct VP9_COMP *const cpi);
 
 // Save the layer context after encoding the frame.
 void vp9_save_layer_context(struct VP9_COMP *const cpi);
 
 // Initialize second pass rc for spatial svc.
 void vp9_init_second_pass_spatial_svc(struct VP9_COMP *cpi);
 
 // Increment number of video frames in layer
-void vp9_inc_frame_in_layer(SVC *svc);
+void vp9_inc_frame_in_layer(struct VP9_COMP *const cpi);
 
 // Check if current layer is key frame in spatial upper layer
 int vp9_is_upper_layer_key_frame(const struct VP9_COMP *const cpi);
 
 // Copy the source image, flags and svc parameters into a new framebuffer
 // with the expected stride/border
 int vp9_svc_lookahead_push(const struct VP9_COMP *const cpi,
                            struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
                            int64_t ts_start, int64_t ts_end,
                            unsigned int flags);
 
 // Get the next source buffer to encode
 struct lookahead_entry *vp9_svc_lookahead_pop(struct VP9_COMP *const cpi,
                                               struct lookahead_ctx *ctx,
                                               int drain);
 
 // Get a future source buffer to encode
 struct lookahead_entry *vp9_svc_lookahead_peek(struct VP9_COMP *const cpi,
                                                struct lookahead_ctx *ctx,
                                                int index, int copy_params);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VP9_ENCODER_VP9_SVC_LAYERCONTEXT_