Base screenshare layers on TemporalReferences.

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 446d162c3e8ce9a4370cacfda0e14405e5f9915a..45096e0c0ca070eb54c3738860b429da6eb47484 100644
--- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
+++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h
@@ -20,44 +20,6 @@
 
 namespace webrtc {
 
-enum TemporalBufferUsage {
-  kNone = 0,
-  kReference = 1,
-  kUpdate = 2,
-  kReferenceAndUpdate = kReference | kUpdate,
-};
-enum TemporalFlags { kLayerSync = 1, kFreezeEntropy = 2 };
-
-struct TemporalReferences {
-  TemporalReferences(TemporalBufferUsage last,
-                     TemporalBufferUsage golden,
-                     TemporalBufferUsage arf);
-  TemporalReferences(TemporalBufferUsage last,
-                     TemporalBufferUsage golden,
-                     TemporalBufferUsage arf,
-                     int extra_flags);
-
-  const bool reference_last;
-  const bool update_last;
-  const bool reference_golden;
-  const bool update_golden;
-  const bool reference_arf;
-  const bool update_arf;
-
-  // TODO(pbos): Consider breaking these out of here and returning only a
-  // pattern index that needs to be returned to fill CodecSpecificInfoVP8 or
-  // EncodeFlags.
-  const bool layer_sync;
-  const bool freeze_entropy;
-
- private:
-  TemporalReferences(TemporalBufferUsage last,
-                     TemporalBufferUsage golden,
-                     TemporalBufferUsage arf,
-                     bool layer_sync,
-                     bool freeze_entropy);
-};
-
 class DefaultTemporalLayers : public TemporalLayers {
  public:
   DefaultTemporalLayers(int number_of_temporal_layers,
@@ -66,7 +28,7 @@ class DefaultTemporalLayers : public TemporalLayers {
 
   // Returns the recommended VP8 encode flags needed. May refresh the decoder
   // and/or update the reference buffers.
-  int EncodeFlags(uint32_t timestamp) override;
+  TemporalReferences UpdateLayerConfig(uint32_t timestamp) override;
 
   // Update state based on new bitrate target and incoming framerate.
   // Returns the bitrate allocation for the active temporal layers.
@@ -76,11 +38,11 @@ class DefaultTemporalLayers : public TemporalLayers {
 
   bool UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) override;
 
-  void PopulateCodecSpecific(bool base_layer_sync,
+  void PopulateCodecSpecific(bool frame_is_keyframe,
                              CodecSpecificInfoVP8* vp8_info,
                              uint32_t timestamp) override;
 
-  void FrameEncoded(unsigned int size, uint32_t timestamp, int qp) override {}
+  void FrameEncoded(unsigned int size, int qp) override {}
 
   int CurrentLayerId() const override;