Move temporal-layer properties to FrameConfig.

webrtc/modules/video_coding/codecs/vp8/screenshare_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/screenshare_layers.h"
@@ skipping 61 matching lines @@
       encode_framerate_(1000.0f, 1000.0f),  // 1 second window, second scale.
       bitrate_updated_(false) {
   RTC_CHECK_GT(number_of_temporal_layers_, 0);
   RTC_CHECK_LE(number_of_temporal_layers_, kMaxNumTemporalLayers);
 }
 
 ScreenshareLayers::~ScreenshareLayers() {
   UpdateHistograms();
 }
 
-int ScreenshareLayers::GetTemporalLayerId(
-    const TemporalLayers::FrameConfig& tl_config) const {
-  // Codec does not use temporal layers for screenshare.
-  return 0;
-}
-
 uint8_t ScreenshareLayers::Tl0PicIdx() const {
   return tl0_pic_idx_;
 }
 
 TemporalLayers::FrameConfig ScreenshareLayers::UpdateLayerConfig(
     uint32_t timestamp) {
   if (number_of_temporal_layers_ <= 1) {
     // No flags needed for 1 layer screenshare.
     // TODO(pbos): Consider updating only last, and not all buffers.
     TemporalLayers::FrameConfig tl_config(
         kReferenceAndUpdate, kReferenceAndUpdate, kReferenceAndUpdate);
-    tl_config.pattern_idx = static_cast<int>(TemporalLayerState::kTl1);
     return tl_config;
   }
 
   const int64_t now_ms = clock_->TimeInMilliseconds();
   if (target_framerate_.value_or(0) > 0 &&
       encode_framerate_.Rate(now_ms).value_or(0) > *target_framerate_) {
     // Max framerate exceeded, drop frame.
     return TemporalLayers::FrameConfig(kNone, kNone, kNone);
   }
 
   if (stats_.first_frame_time_ms_ == -1)
     stats_.first_frame_time_ms_ = now_ms;
 
   int64_t unwrapped_timestamp = time_wrap_handler_.Unwrap(timestamp);
   int64_t ts_diff;
   if (last_timestamp_ == -1) {
     ts_diff = kOneSecond90Khz / capture_framerate_.value_or(*target_framerate_);
   } else {
     ts_diff = unwrapped_timestamp - last_timestamp_;
   }
   // Make sure both frame droppers leak out bits.
   layers_[0].UpdateDebt(ts_diff / 90);
   layers_[1].UpdateDebt(ts_diff / 90);
   last_timestamp_ = timestamp;
 
-  TemporalLayerState layer_state = TemporalLayerState::kDrop;
+  TemporalLayerState layer_state =
+      TemporalLayerState::kDrop;

[brandtr, 2017/06/12 15:15:53]

revert?

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

Done.

 
   if (active_layer_ == -1 ||
       layers_[active_layer_].state != TemporalLayer::State::kDropped) {
     if (last_emitted_tl0_timestamp_ != -1 &&
         (unwrapped_timestamp - last_emitted_tl0_timestamp_) / 90 >
             kMaxFrameIntervalMs) {
       // Too long time has passed since the last frame was emitted, cancel
       // enough debt to allow a single frame.
       layers_[0].debt_bytes_ = max_debt_bytes_ - 1;
     }
     if (layers_[0].debt_bytes_ > max_debt_bytes_) {
       // Must drop TL0, encode TL1 instead.
       if (layers_[1].debt_bytes_ > max_debt_bytes_) {
         // Must drop both TL0 and TL1.
         active_layer_ = -1;
       } else {
         active_layer_ = 1;
       }
     } else {
       active_layer_ = 0;
     }
   }
 
+  bool layer_sync = false;
   switch (active_layer_) {
     case 0:
       layer_state = TemporalLayerState::kTl0;
       last_emitted_tl0_timestamp_ = unwrapped_timestamp;
       break;
     case 1:
       if (TimeToSync(unwrapped_timestamp)) {
+        layer_sync = true;
         last_sync_timestamp_ = unwrapped_timestamp;
         layer_state = TemporalLayerState::kTl1Sync;
       } else {
         layer_state = TemporalLayerState::kTl1;
       }
       break;
     case -1:
       layer_state = TemporalLayerState::kDrop;
       ++stats_.num_dropped_frames_;
       break;
     default:
       RTC_NOTREACHED();
   }
 
   TemporalLayers::FrameConfig tl_config;
   // TODO(pbos): Consider referencing but not updating the 'alt' buffer for all
   // layers.
   switch (layer_state) {
     case TemporalLayerState::kDrop:
       tl_config = TemporalLayers::FrameConfig(kNone, kNone, kNone);
       break;
     case TemporalLayerState::kTl0:
       // TL0 only references and updates 'last'.
       tl_config =
           TemporalLayers::FrameConfig(kReferenceAndUpdate, kNone, kNone);

[brandtr, 2017/06/12 15:15:53]

Add tl_config.packetizer_temporal_idx = 0; explicitly?

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

Done.

       break;
     case TemporalLayerState::kTl1:
       // TL1 references both 'last' and 'golden' but only updates 'golden'.
       tl_config =
           TemporalLayers::FrameConfig(kReference, kReferenceAndUpdate, kNone);
+      tl_config.packetizer_temporal_idx = 1;
       break;
     case TemporalLayerState::kTl1Sync:
       // Predict from only TL0 to allow participants to switch to the high
       // bitrate stream. Updates 'golden' so that TL1 can continue to refer to
       // and update 'golden' from this point on.
       tl_config = TemporalLayers::FrameConfig(kReference, kUpdate, kNone);
+      tl_config.packetizer_temporal_idx = 1;
       break;
   }
 
-  tl_config.pattern_idx = static_cast<int>(layer_state);
+  tl_config.layer_sync = layer_sync;
   return tl_config;
 }
 
 std::vector<uint32_t> ScreenshareLayers::OnRatesUpdated(int bitrate_kbps,
                                                         int max_bitrate_kbps,
                                                         int framerate) {
   RTC_DCHECK_GT(framerate, 0);
   if (!target_framerate_) {
     // First OnRatesUpdated() is called during construction, with the configured
     // targets as parameters.
@@ skipping 56 matching lines @@
     stats_.tl1_target_bitrate_sum_ += layers_[1].target_rate_kbps_;
     stats_.tl1_qp_sum_ += qp;
   }
 }
 
 void ScreenshareLayers::PopulateCodecSpecific(
     bool frame_is_keyframe,
     const TemporalLayers::FrameConfig& tl_config,
     CodecSpecificInfoVP8* vp8_info,
     uint32_t timestamp) {
-  int64_t unwrapped_timestamp = time_wrap_handler_.Unwrap(timestamp);
   if (number_of_temporal_layers_ == 1) {
     vp8_info->temporalIdx = kNoTemporalIdx;
     vp8_info->layerSync = false;
     vp8_info->tl0PicIdx = kNoTl0PicIdx;
   } else {
-    TemporalLayerState layer_state =
-        static_cast<TemporalLayerState>(tl_config.pattern_idx);
-    switch (layer_state) {
-      case TemporalLayerState::kDrop:
-        RTC_NOTREACHED();
-        break;
-      case TemporalLayerState::kTl0:
-        vp8_info->temporalIdx = 0;
-        break;
-      case TemporalLayerState::kTl1:
-      case TemporalLayerState::kTl1Sync:
-        vp8_info->temporalIdx = 1;
-        break;
-    }
+    int64_t unwrapped_timestamp = time_wrap_handler_.Unwrap(timestamp);
+    vp8_info->temporalIdx = tl_config.packetizer_temporal_idx;
+    vp8_info->layerSync = tl_config.layer_sync;
     if (frame_is_keyframe) {
       vp8_info->temporalIdx = 0;
       last_sync_timestamp_ = unwrapped_timestamp;
+      vp8_info->layerSync = true;
     } else 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.
       last_sync_timestamp_ = unwrapped_timestamp;
+      vp8_info->layerSync = true;
     }
-    vp8_info->layerSync = last_sync_timestamp_ != -1 &&
-                          last_sync_timestamp_ == unwrapped_timestamp;
     if (vp8_info->temporalIdx == 0) {
       tl0_pic_idx_++;
     }
     last_base_layer_sync_ = frame_is_keyframe;
     vp8_info->tl0PicIdx = tl0_pic_idx_;
   }
 }
 
 bool ScreenshareLayers::TimeToSync(int64_t timestamp) const {
   RTC_DCHECK_EQ(1, active_layer_);
@@ skipping 148 matching lines @@
       RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.Screenshare.Layer1.Qp",
                                  stats_.tl1_qp_sum_ / stats_.num_tl1_frames_);
       RTC_HISTOGRAM_COUNTS_10000(
           "WebRTC.Video.Screenshare.Layer1.TargetBitrate",
           stats_.tl1_target_bitrate_sum_ / stats_.num_tl1_frames_);
     }
   }
 }
 
 }  // namespace webrtc