Move temporal-layer properties to FrameConfig.

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

 /* Copyright (c) 2011 The WebRTC 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.
 */
 /*
 * This file defines the interface for doing temporal layers with VP8.
@@ skipping 29 matching lines @@
     FrameConfig(BufferFlags last,
                 BufferFlags golden,
                 BufferFlags arf,
                 FreezeEntropy);
 
     bool drop_frame;
     BufferFlags last_buffer_flags;
     BufferFlags golden_buffer_flags;
     BufferFlags arf_buffer_flags;
 
-    // TODO(pbos): Consider breaking these out of here and returning only a
-    // pattern index that needs to be returned to fill CodecSpecificInfoVP8 or
-    // EncodeFlags.
+    int encoder_layer_id;
+    int packetizer_temporal_idx;

[sprang_webrtc, 2017/06/13 11:39:22]

Please add a comment explaining what the difference between these are and why
this hack exists. Maybe also a todo about cleaning this up when we (hopefully)
nuke screenshare_layers

[pbos-webrtc, 2017/06/15 21:59:09]

Done.

+
     bool layer_sync;
+
     bool freeze_entropy;
 
-    int pattern_idx;
-
    private:
     FrameConfig(BufferFlags last,
                 BufferFlags golden,
                 BufferFlags arf,
                 bool freeze_entropy);
   };
 
   // Factory for TemporalLayer strategy. Default behavior is a fixed pattern
   // of temporal layers. See default_temporal_layers.cc
   virtual ~TemporalLayers() {}
@@ skipping 16 matching lines @@
       bool is_keyframe,
       const TemporalLayers::FrameConfig& tl_config,
       CodecSpecificInfoVP8* vp8_info,
       uint32_t timestamp) = 0;
 
   virtual void FrameEncoded(unsigned int size, int qp) = 0;
 
   // Returns the current tl0_pic_idx, so it can be reused in future
   // instantiations.
   virtual uint8_t Tl0PicIdx() const = 0;
-  virtual int GetTemporalLayerId(
-      const TemporalLayers::FrameConfig& tl_config) const = 0;
 };
 
 class TemporalLayersListener;
 class TemporalLayersFactory {
  public:
   TemporalLayersFactory() : listener_(nullptr) {}
   virtual ~TemporalLayersFactory() {}
   virtual TemporalLayers* Create(int simulcast_id,
                                  int temporal_layers,
                                  uint8_t initial_tl0_pic_idx) const;
@@ skipping 17 matching lines @@
  public:
   TemporalLayersListener() {}
   virtual ~TemporalLayersListener() {}
 
   virtual void OnTemporalLayersCreated(int simulcast_id,
                                        TemporalLayers* layers) = 0;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_