Remove layer_sync from TL frame config.

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

 /* Copyright (c) 2013 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.
 */
 
 #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h"
@@ skipping 12 matching lines @@
 #include "vpx/vpx_encoder.h"
 #include "vpx/vp8cx.h"
 
 namespace webrtc {
 
 TemporalLayers::FrameConfig::FrameConfig() {}
 
 TemporalLayers::FrameConfig::FrameConfig(TemporalLayers::BufferFlags last,
                                          TemporalLayers::BufferFlags golden,
                                          TemporalLayers::BufferFlags arf)
-    : FrameConfig(last, golden, arf, false, false) {}
+    : FrameConfig(last, golden, arf, false) {}
 
 TemporalLayers::FrameConfig::FrameConfig(TemporalLayers::BufferFlags last,
                                          TemporalLayers::BufferFlags golden,
                                          TemporalLayers::BufferFlags arf,
-                                         int extra_flags)
-    : FrameConfig(last,
-                  golden,
-                  arf,
-                  (extra_flags & kLayerSync) != 0,
-                  (extra_flags & kFreezeEntropy) != 0) {}
+                                         FreezeEntropy)
+    : FrameConfig(last, golden, arf, true) {}
 
 TemporalLayers::FrameConfig::FrameConfig(TemporalLayers::BufferFlags last,
                                          TemporalLayers::BufferFlags golden,
                                          TemporalLayers::BufferFlags arf,
-                                         bool layer_sync,
                                          bool freeze_entropy)
     : drop_frame(last == TemporalLayers::kNone &&
                  golden == TemporalLayers::kNone &&
                  arf == TemporalLayers::kNone),
       last_buffer_flags(last),
       golden_buffer_flags(golden),
       arf_buffer_flags(arf),
-      layer_sync(layer_sync),
       freeze_entropy(freeze_entropy) {}
 
 namespace {
 
 std::vector<unsigned int> GetTemporalIds(size_t num_layers) {
   switch (num_layers) {
     case 1:
       // Temporal layer structure (single layer):
       // 0 0 0 0 ...
       return {0};
@@ skipping 16 matching lines @@
       // 0               0               ...
       return {0, 3, 2, 3, 1, 3, 2, 3};
     default:
       RTC_NOTREACHED();
       break;
   }
   RTC_NOTREACHED();
   return {0};
 }
 
+std::vector<bool> GetTemporalLayerSync(size_t num_layers) {
+  switch (num_layers) {
+    case 1:
+      return {false};
+    case 2:
+      return {false, true, false, false, false, false, false, false};
+    case 3:
+      return {false, true, true, false, false, false, false, false};
+    case 4:
+      return {false, true, true,  true, true,  true, false, true,
+              false, true, false, true, false, true, false, true};
+    default:
+      RTC_NOTREACHED();
+      break;
+  }
+  RTC_NOTREACHED();
+  return {false};
+}
+
 std::vector<TemporalLayers::FrameConfig> GetTemporalPattern(size_t num_layers) {
   // For indexing in the patterns described below (which temporal layers they
   // belong to), see the diagram above.
   // Layer sync is done similarly for all patterns (except single stream) and
   // happens every 8 frames:
   // TL1 layer syncs by periodically by only referencing TL0 ('last'), but still
   // updating 'golden', so it can be used as a reference by future TL1 frames.
   // TL2 layer syncs just before TL1 by only depending on TL0 (and not depending
   // on TL1's buffer before TL1 has layer synced).
   // TODO(pbos): Consider cyclically updating 'arf' (and 'golden' for 1TL) for
   // the base layer in 1-3TL instead of 'last' periodically on long intervals,
   // so that if scene changes occur (user walks between rooms or rotates webcam)
   // the 'arf' (or 'golden' respectively) is not stuck on a no-longer relevant
   // keyframe.
   switch (num_layers) {
     case 1:
       // All frames reference all buffers and the 'last' buffer is updated.
       return {TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kReference,
                                           TemporalLayers::kReference)};
     case 2:
       // All layers can reference but not update the 'alt' buffer, this means
       // that the 'alt' buffer reference is effectively the last keyframe.
       // TL0 also references and updates the 'last' buffer.
       // TL1 also references 'last' and references and updates 'golden'.
       return {TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kUpdate,
                                           TemporalLayers::kReference),
-              TemporalLayers::FrameConfig(
-                  TemporalLayers::kReference, TemporalLayers::kUpdate,
-                  TemporalLayers::kReference, kLayerSync),
+              TemporalLayers::FrameConfig(TemporalLayers::kReference,
+                                          TemporalLayers::kUpdate,
+                                          TemporalLayers::kReference),
               TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kFreezeEntropy)};
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy)};
     case 3:
       // All layers can reference but not update the 'alt' buffer, this means
       // that the 'alt' buffer reference is effectively the last keyframe.
       // TL0 also references and updates the 'last' buffer.
       // TL1 also references 'last' and references and updates 'golden'.
       // TL2 references both 'last' and 'golden' but updates no buffer.
       return {TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kUpdate,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kNone,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
-              TemporalLayers::FrameConfig(
-                  TemporalLayers::kReference, TemporalLayers::kUpdate,
-                  TemporalLayers::kReference, kLayerSync),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
+              TemporalLayers::FrameConfig(TemporalLayers::kReference,
+                                          TemporalLayers::kUpdate,
+                                          TemporalLayers::kReference),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kReference),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kFreezeEntropy)};
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy)};
     case 4:
       // TL0 references and updates only the 'last' buffer.
       // TL1 references 'last' and updates and references 'golden'.
       // TL2 references 'last' and 'golden', and references and updates 'arf'.
       // TL3 references all buffers but update none of them.
       return {TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kNone),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kNone,
-                                          TemporalLayers::kUpdate, kLayerSync),
+                                          TemporalLayers::kUpdate),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kUpdate,
-                                          TemporalLayers::kNone, kLayerSync),
+                                          TemporalLayers::kNone),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone,
                                           TemporalLayers::kNone),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate,
                                           TemporalLayers::kNone),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy),
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy),
               TemporalLayers::FrameConfig(TemporalLayers::kReference,
                                           TemporalLayers::kReference,
                                           TemporalLayers::kReferenceAndUpdate),
               TemporalLayers::FrameConfig(
                   TemporalLayers::kReference, TemporalLayers::kReference,
-                  TemporalLayers::kReference, kLayerSync | kFreezeEntropy)};
+                  TemporalLayers::kReference, TemporalLayers::kFreezeEntropy)};
     default:
       RTC_NOTREACHED();
       break;
   }
   RTC_NOTREACHED();
   return {TemporalLayers::FrameConfig(
       TemporalLayers::kNone, TemporalLayers::kNone, TemporalLayers::kNone)};
 }
 
 }  // namespace
 
 DefaultTemporalLayers::DefaultTemporalLayers(int number_of_temporal_layers,
                                              uint8_t initial_tl0_pic_idx)
     : num_layers_(std::max(1, number_of_temporal_layers)),
       temporal_ids_(GetTemporalIds(num_layers_)),
+      temporal_layer_sync_(GetTemporalLayerSync(num_layers_)),
       temporal_pattern_(GetTemporalPattern(num_layers_)),
       tl0_pic_idx_(initial_tl0_pic_idx),
       pattern_idx_(255),
       timestamp_(0),
       last_base_layer_sync_(false) {
+  RTC_DCHECK_EQ(temporal_pattern_.size(), temporal_layer_sync_.size());
   RTC_CHECK_GE(kMaxTemporalStreams, number_of_temporal_layers);
   RTC_CHECK_GE(number_of_temporal_layers, 0);
   RTC_CHECK_LE(number_of_temporal_layers, 4);
   // pattern_idx_ wraps around temporal_pattern_.size, this is incorrect if
   // temporal_ids_ are ever longer. If this is no longer correct it needs to
   // wrap at max(temporal_ids_.size(), temporal_pattern_.size()).
   RTC_DCHECK_LE(temporal_ids_.size(), temporal_pattern_.size());
 }
 
 int DefaultTemporalLayers::GetTemporalLayerId(
@@ skipping 77 matching lines @@
     vp8_info->temporalIdx = kNoTemporalIdx;
     vp8_info->layerSync = false;
     vp8_info->tl0PicIdx = kNoTl0PicIdx;
   } else {
     if (frame_is_keyframe) {
       vp8_info->temporalIdx = 0;
       vp8_info->layerSync = true;
     } else {
       vp8_info->temporalIdx = GetTemporalLayerId(tl_config);
 
-      vp8_info->layerSync = tl_config.layer_sync;
+      vp8_info->layerSync = temporal_layer_sync_[tl_config.pattern_idx %
+                                                 temporal_layer_sync_.size()];
     }
     if (last_base_layer_sync_ && vp8_info->temporalIdx != 0) {
       // Regardless of pattern the frame after a base layer sync will always
       // be a layer sync.
       vp8_info->layerSync = true;
     }
     if (vp8_info->temporalIdx == 0 && timestamp != timestamp_) {
       timestamp_ = timestamp;
       tl0_pic_idx_++;
     }
@@ skipping 11 matching lines @@
   if (listener_)
     listener_->OnTemporalLayersCreated(simulcast_id, tl);
   return tl;
 }
 
 void TemporalLayersFactory::SetListener(TemporalLayersListener* listener) {
   listener_ = listener;
 }
 
 }  // namespace webrtc