Revert of Issue 2434073003: Extract bitrate allocation ...

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 47 matching lines @@
       number_of_temporal_layers_(num_temporal_layers),
       last_base_layer_sync_(false),
       tl0_pic_idx_(initial_tl0_pic_idx),
       active_layer_(-1),
       last_timestamp_(-1),
       last_sync_timestamp_(-1),
       last_emitted_tl0_timestamp_(-1),
       min_qp_(-1),
       max_qp_(-1),
       max_debt_bytes_(0),
-      framerate_(-1),
-      bitrate_updated_(false) {
+      frame_rate_(-1) {
   RTC_CHECK_GT(num_temporal_layers, 0);
   RTC_CHECK_LE(num_temporal_layers, 2);
 }
 
 ScreenshareLayers::~ScreenshareLayers() {
   UpdateHistograms();
 }
 
 int ScreenshareLayers::CurrentLayerId() const {
   // Codec does not use temporal layers for screenshare.
@@ skipping 50 matching lines @@
       flags = -1;
       ++stats_.num_dropped_frames_;
       break;
     default:
       flags = -1;
       RTC_NOTREACHED();
   }
 
   int64_t ts_diff;
   if (last_timestamp_ == -1) {
-    ts_diff = kOneSecond90Khz / (framerate_ <= 0 ? 5 : framerate_);
+    ts_diff = kOneSecond90Khz / (frame_rate_ <= 0 ? 5 : frame_rate_);
   } 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;
   return flags;
 }
 
-std::vector<uint32_t> ScreenshareLayers::OnRatesUpdated(int bitrate_kbps,
-                                                        int max_bitrate_kbps,
-                                                        int framerate) {
+bool ScreenshareLayers::ConfigureBitrates(int bitrate_kbps,
+                                          int max_bitrate_kbps,
+                                          int framerate,
+                                          vpx_codec_enc_cfg_t* cfg) {
   layers_[0].target_rate_kbps_ = bitrate_kbps;
   layers_[1].target_rate_kbps_ = max_bitrate_kbps;
-  framerate_ = framerate;
-  bitrate_updated_ = true;
 
-  std::vector<uint32_t> allocation;
-  allocation.push_back(bitrate_kbps);
-  if (max_bitrate_kbps > bitrate_kbps)
-    allocation.push_back(max_bitrate_kbps - bitrate_kbps);
-  return allocation;
+  int target_bitrate_kbps = bitrate_kbps;
+
+  if (cfg != nullptr) {
+    if (number_of_temporal_layers_ > 1) {
+      // Calculate a codec target bitrate. This may be higher than TL0, gaining
+      // quality at the expense of frame rate at TL0. Constraints:
+      // - TL0 frame rate no less than framerate / kMaxTL0FpsReduction.
+      // - Target rate * kAcceptableTargetOvershoot should not exceed TL1 rate.
+      target_bitrate_kbps =
+          std::min(bitrate_kbps * kMaxTL0FpsReduction,
+                   max_bitrate_kbps / kAcceptableTargetOvershoot);
+
+      cfg->rc_target_bitrate = std::max(bitrate_kbps, target_bitrate_kbps);
+    }
+
+    // Don't reconfigure qp limits during quality boost frames.
+    if (active_layer_ == -1 ||
+        layers_[active_layer_].state != TemporalLayer::State::kQualityBoost) {
+      min_qp_ = cfg->rc_min_quantizer;
+      max_qp_ = cfg->rc_max_quantizer;
+      // After a dropped frame, a frame with max qp will be encoded and the
+      // quality will then ramp up from there. To boost the speed of recovery,
+      // encode the next frame with lower max qp. TL0 is the most important to
+      // improve since the errors in this layer will propagate to TL1.
+      // Currently, reduce max qp by 20% for TL0 and 15% for TL1.
+      layers_[0].enhanced_max_qp = min_qp_ + (((max_qp_ - min_qp_) * 80) / 100);
+      layers_[1].enhanced_max_qp = min_qp_ + (((max_qp_ - min_qp_) * 85) / 100);
+    }
+  }
+
+  int avg_frame_size = (target_bitrate_kbps * 1000) / (8 * framerate);
+  max_debt_bytes_ = 4 * avg_frame_size;
+
+  return true;
 }
 
 void ScreenshareLayers::FrameEncoded(unsigned int size,
                                      uint32_t timestamp,
                                      int qp) {
   if (number_of_temporal_layers_ == 1)
     return;
 
   RTC_DCHECK_NE(-1, active_layer_);
   if (size == 0) {
@@ skipping 71 matching lines @@
     return false;
   }
   // Issue a sync frame if difference in quality between TL0 and TL1 isn't too
   // large.
   if (layers_[0].last_qp - layers_[1].last_qp < kQpDeltaThresholdForSync)
     return true;
   return false;
 }
 
 bool ScreenshareLayers::UpdateConfiguration(vpx_codec_enc_cfg_t* cfg) {
-  bool cfg_updated = false;
-  if (bitrate_updated_) {
-    uint32_t target_bitrate_kbps = layers_[0].target_rate_kbps_;
-
-    if (number_of_temporal_layers_ > 1) {
-      // Calculate a codec target bitrate. This may be higher than TL0, gaining
-      // quality at the expense of frame rate at TL0. Constraints:
-      // - TL0 frame rate no less than framerate / kMaxTL0FpsReduction.
-      // - Target rate * kAcceptableTargetOvershoot should not exceed TL1 rate.
-      target_bitrate_kbps =
-          std::min(layers_[0].target_rate_kbps_ * kMaxTL0FpsReduction,
-                   layers_[1].target_rate_kbps_ / kAcceptableTargetOvershoot);
-
-      cfg->rc_target_bitrate =
-          std::max(layers_[0].target_rate_kbps_, target_bitrate_kbps);
-    }
-
-    // Don't reconfigure qp limits during quality boost frames.
-    if (active_layer_ == -1 ||
-        layers_[active_layer_].state != TemporalLayer::State::kQualityBoost) {
-      min_qp_ = cfg->rc_min_quantizer;
-      max_qp_ = cfg->rc_max_quantizer;
-      // After a dropped frame, a frame with max qp will be encoded and the
-      // quality will then ramp up from there. To boost the speed of recovery,
-      // encode the next frame with lower max qp. TL0 is the most important to
-      // improve since the errors in this layer will propagate to TL1.
-      // Currently, reduce max qp by 20% for TL0 and 15% for TL1.
-      layers_[0].enhanced_max_qp = min_qp_ + (((max_qp_ - min_qp_) * 80) / 100);
-      layers_[1].enhanced_max_qp = min_qp_ + (((max_qp_ - min_qp_) * 85) / 100);
-    }
-
-    if (framerate_ > 0) {
-      int avg_frame_size = (target_bitrate_kbps * 1000) / (8 * framerate_);
-      max_debt_bytes_ = 4 * avg_frame_size;
-    }
-
-    bitrate_updated_ = false;
-    cfg_updated = true;
-  }
-
-  // Don't try to update boosts state if not active yet.
-  if (active_layer_ == -1)
-    return cfg_updated;
-
   if (max_qp_ == -1 || number_of_temporal_layers_ <= 1)
-    return cfg_updated;
+    return false;
+  RTC_DCHECK_NE(-1, active_layer_);
 
   // If layer is in the quality boost state (following a dropped frame), update
   // the configuration with the adjusted (lower) qp and set the state back to
   // normal.
   unsigned int adjusted_max_qp;
   if (layers_[active_layer_].state == TemporalLayer::State::kQualityBoost &&
       layers_[active_layer_].enhanced_max_qp != -1) {
     adjusted_max_qp = layers_[active_layer_].enhanced_max_qp;
     layers_[active_layer_].state = TemporalLayer::State::kNormal;
   } else {
     if (max_qp_ == -1)
-      return cfg_updated;
+      return false;
     adjusted_max_qp = max_qp_;  // Set the normal max qp.
   }
 
   if (adjusted_max_qp == cfg->rc_max_quantizer)
-    return cfg_updated;
+    return false;
 
   cfg->rc_max_quantizer = adjusted_max_qp;
-  cfg_updated = true;
-  return cfg_updated;
+  return true;
 }
 
 void ScreenshareLayers::TemporalLayer::UpdateDebt(int64_t delta_ms) {
   uint32_t debt_reduction_bytes = target_rate_kbps_ * delta_ms / 8;
   if (debt_reduction_bytes >= debt_bytes_) {
     debt_bytes_ = 0;
   } else {
     debt_bytes_ -= debt_reduction_bytes;
   }
 }
@@ skipping 30 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