Derive current layer from TL frame config.

webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h

Index: webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
index be2d892816d49bc6e463cf78ef6d4c453773b315..fd2c205549a16ba86c4efdfc6f870a3dc05ad1ab 100644
--- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
+++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
@@ -28,7 +28,7 @@ class DefaultTemporalLayers : public TemporalLayers {
 
   // Returns the recommended VP8 encode flags needed. May refresh the decoder
   // and/or update the reference buffers.
-  TemporalReferences UpdateLayerConfig(uint32_t timestamp) override;
+  TemporalLayers::FrameConfig UpdateLayerConfig(uint32_t timestamp) override;
 
   // Update state based on new bitrate target and incoming framerate.
   // Returns the bitrate allocation for the active temporal layers.
@@ -39,19 +39,21 @@ class DefaultTemporalLayers : public TemporalLayers {
   bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) override;
 
   void PopulateCodecSpecific(bool frame_is_keyframe,
+                             const TemporalLayers::FrameConfig& tl_config,
                              CodecSpecificInfoVP8* vp8_info,
                              uint32_t timestamp) override;
 
   void FrameEncoded(unsigned int size, int qp) override {}
 
-  int CurrentLayerId() const override;
+  int GetTemporalLayerId(
+      const TemporalLayers::FrameConfig& references) const override;
 
   uint8_t Tl0PicIdx() const override;
 
  private:
   const size_t num_layers_;
   const std::vector<unsigned int> temporal_ids_;
-  const std::vector<TemporalReferences> temporal_pattern_;
+  const std::vector<TemporalLayers::FrameConfig> temporal_pattern_;
 
   uint8_t tl0_pic_idx_;
   uint8_t pattern_idx_;