Derive current layer from TL frame config.

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 60 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::CurrentLayerId() const {
+int ScreenshareLayers::GetTemporalLayerId(
+    TemporalLayers::FrameConfig tl_config) const {
   // Codec does not use temporal layers for screenshare.
   return 0;
 }
 
-TemporalReferences ScreenshareLayers::UpdateLayerConfig(uint32_t timestamp) {
+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.
-    return TemporalReferences(kReferenceAndUpdate, kReferenceAndUpdate,
-                              kReferenceAndUpdate);
+    return TemporalLayers::FrameConfig(kReferenceAndUpdate, kReferenceAndUpdate,
+                                       kReferenceAndUpdate);
   }
 
   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 TemporalReferences(kNone, kNone, kNone);
+    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);
   enum TemporalLayerState { kDrop, kTl0, kTl1, kTl1Sync };
   enum TemporalLayerState layer_state = kDrop;
   if (active_layer_ == -1 ||
       layers_[active_layer_].state != TemporalLayer::State::kDropped) {
@@ skipping 45 matching lines @@
     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;
   // TODO(pbos): Consider referencing but not updating the 'alt' buffer for all
   // layers.
   switch (layer_state) {
     case kDrop:
-      return TemporalReferences(kNone, kNone, kNone);
+      return TemporalLayers::FrameConfig(kNone, kNone, kNone);
     case kTl0:
       // TL0 only references and updates 'last'.
-      return TemporalReferences(kReferenceAndUpdate, kNone, kNone);
+      return TemporalLayers::FrameConfig(kReferenceAndUpdate, kNone, kNone);
     case kTl1:
       // TL1 references both 'last' and 'golden' but only updates 'golden'.
-      return TemporalReferences(kReference, kReferenceAndUpdate, kNone);
+      return TemporalLayers::FrameConfig(kReference, kReferenceAndUpdate,
+                                         kNone);
     case 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.
-      return TemporalReferences(kReference, kUpdate, kNone, kLayerSync);
+      return TemporalLayers::FrameConfig(kReference, kUpdate, kNone,
+                                         kLayerSync);
   }
   RTC_NOTREACHED();
-  return TemporalReferences(kNone, kNone, kNone);
+  return TemporalLayers::FrameConfig(kNone, kNone, kNone);
 }
 
 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.
     target_framerate_.emplace(framerate);
@@ skipping 50 matching lines @@
     stats_.tl0_target_bitrate_sum_ += layers_[0].target_rate_kbps_;
     stats_.tl0_qp_sum_ += qp;
   } else if (active_layer_ == 1) {
     layers_[1].debt_bytes_ += size;
     ++stats_.num_tl1_frames_;
     stats_.tl1_target_bitrate_sum_ += layers_[1].target_rate_kbps_;
     stats_.tl1_qp_sum_ += qp;
   }
 }
 
-void ScreenshareLayers::PopulateCodecSpecific(bool frame_is_keyframe,
-                                              CodecSpecificInfoVP8* vp8_info,
-                                              uint32_t timestamp) {
+void ScreenshareLayers::PopulateCodecSpecific(
+    bool frame_is_keyframe,
+    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 {
+    // TODO(pbos): Add active_layer_ to TemporalLayers::FrameConfig (as
+    // pattern_idx) and
+    //             make function const.

[sprang_webrtc, 2017/05/03 15:18:43]

reflow comment

[pbos-webrtc, 2017/05/04 10:52:22]

Oops, done, thanks. :)

     RTC_DCHECK_NE(-1, active_layer_);
     vp8_info->temporalIdx = active_layer_;
     if (frame_is_keyframe) {
       vp8_info->temporalIdx = 0;
       last_sync_timestamp_ = unwrapped_timestamp;
     } 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;
     }
@@ skipping 149 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