| Index: webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
|
| index 471daa636e29d70e67f860cb0d9ed525e5d5bfb1..f5d2aabcbe837b8bfe4c47ca06857c911950ad0d 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/temporal_layers.h
|
| @@ -24,11 +24,6 @@ namespace webrtc {
|
|
|
| struct CodecSpecificInfoVP8;
|
|
|
| -// TODO(pbos): Remove along with layer_sync and freeze_entropy, they are
|
| -// derivable from picture_idx and should be exposed with
|
| -// TL::IsLayerSync(TL::FrameConfig).
|
| -enum TemporalFlags { kLayerSync = 1, kFreezeEntropy = 2 };
|
| -
|
| class TemporalLayers {
|
| public:
|
| enum BufferFlags {
|
| @@ -37,6 +32,7 @@ class TemporalLayers {
|
| kUpdate = 2,
|
| kReferenceAndUpdate = kReference | kUpdate,
|
| };
|
| + enum FreezeEntropy { kFreezeEntropy };
|
|
|
| struct FrameConfig {
|
| FrameConfig();
|
| @@ -45,7 +41,7 @@ class TemporalLayers {
|
| FrameConfig(BufferFlags last,
|
| BufferFlags golden,
|
| BufferFlags arf,
|
| - int extra_flags);
|
| + FreezeEntropy);
|
|
|
| bool drop_frame;
|
| BufferFlags last_buffer_flags;
|
| @@ -64,7 +60,6 @@ class TemporalLayers {
|
| FrameConfig(BufferFlags last,
|
| BufferFlags golden,
|
| BufferFlags arf,
|
| - bool layer_sync,
|
| bool freeze_entropy);
|
| };
|
|
|
|
|