commit 840394c6eb84b07419dcdfad1ecb6d114b1cefc7
author Ilya Nikolaevskiy <ilnik@webrtc.org> Tue Nov 26 17:20:50 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Nov 27 16:49:54 2019 +0000
tree ca7bc967b7d0ce89a73bedfe34eb6fac2e709283
parent b529b7aeba4cb05ce69212374d3e5a542e042a95

Fix bw_limited_resolution in SendStatisticsProxy GetStats

Removed old code, which took care of VP8 case, but actually interferes with
VP9 case.

Now regardless of codec bw_limited_resolution is calculated based on signals
from the bitrate allocator.

Bug: webrtc:11015
Change-Id: Ic99dbb504ab2d1a4b5f15ca93193a1af05ae5924
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160651
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29937}

video/send_statistics_proxy.cc

diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
index 58fb82e..a4f1754 100644
--- a/video/send_statistics_proxy.cc
+++ b/video/send_statistics_proxy.cc
@@ -215,9 +215,7 @@
   }
 }
 
-void SendStatisticsProxy::UmaSamplesContainer::RemoveOld(
-    int64_t now_ms,
-    bool* is_limited_in_resolution) {
+void SendStatisticsProxy::UmaSamplesContainer::RemoveOld(int64_t now_ms) {
   while (!encoded_frames_.empty()) {
     auto it = encoded_frames_.begin();
     if (now_ms - it->second.send_ms < kMaxEncodedFrameWindowMs)
@@ -229,7 +227,6 @@
 
     // Check number of encoded streams per timestamp.
     if (num_streams_ > static_cast<size_t>(it->second.max_simulcast_idx)) {
-      *is_limited_in_resolution = false;
       if (num_streams_ > 1) {
         int disabled_streams =
             static_cast<int>(num_streams_ - 1 - it->second.max_simulcast_idx);
@@ -240,7 +237,6 @@
         bw_limited_frame_counter_.Add(bw_limited_resolution);
         if (bw_limited_resolution) {
           bw_resolutions_disabled_counter_.Add(disabled_streams);
-          *is_limited_in_resolution = true;
         }
       }
     }
@@ -250,10 +246,9 @@
 
 bool SendStatisticsProxy::UmaSamplesContainer::InsertEncodedFrame(
     const EncodedImage& encoded_frame,
-    int simulcast_idx,
-    bool* is_limited_in_resolution) {
+    int simulcast_idx) {
   int64_t now_ms = clock_->TimeInMilliseconds();
-  RemoveOld(now_ms, is_limited_in_resolution);
+  RemoveOld(now_ms);
   if (encoded_frames_.size() > kMaxEncodedFrameMapSize) {
     encoded_frames_.clear();
   }
@@ -984,16 +979,11 @@
 
   media_byte_rate_tracker_.AddSamples(encoded_image.size());
 
-  // Initialize to current since |is_limited_in_resolution| is only updated
-  // when an encoded frame is removed from the EncodedFrameMap.
-  bool is_limited_in_resolution = stats_.bw_limited_resolution;
-  if (uma_container_->InsertEncodedFrame(encoded_image, simulcast_idx,
-                                         &is_limited_in_resolution)) {
+  if (uma_container_->InsertEncodedFrame(encoded_image, simulcast_idx)) {
     encoded_frame_rate_tracker_.AddSamples(1);
   }
 
-  stats_.bw_limited_resolution =
-      is_limited_in_resolution || quality_downscales_ > 0;
+  stats_.bw_limited_resolution |= quality_downscales_ > 0;
 
   if (quality_downscales_ != -1) {
     uma_container_->quality_limited_frame_counter_.Add(quality_downscales_ > 0);