commit 8e56076bb4adf76d1fe3f789c89bab510b6aa785
author philipel <philipel@webrtc.org> Mon Oct 02 12:00:13 2017
committer Commit Bot <commit-bot@chromium.org> Mon Oct 02 13:17:59 2017
tree e5d8d8e8366adc9960d81c057e5fbf67c3732f9b
parent b378a22544b91c0a3c586156db90d76063cf9717

LogDelayBasedBweUpdate on detector state change.

Bug: webrtc:8287
Change-Id: I927c766e587d89f81a6dc8696557b7d43369fbf9
Reviewed-on: https://webrtc-review.googlesource.com/4140
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20077}

modules/congestion_controller/delay_based_bwe.cc

diff --git a/modules/congestion_controller/delay_based_bwe.cc b/modules/congestion_controller/delay_based_bwe.cc
index a49d468..d269be1 100644
--- a/modules/congestion_controller/delay_based_bwe.cc
+++ b/modules/congestion_controller/delay_based_bwe.cc
@@ -83,8 +83,8 @@
       trendline_smoothing_coeff_(kDefaultTrendlineSmoothingCoeff),
       trendline_threshold_gain_(kDefaultTrendlineThresholdGain),
       consecutive_delayed_feedbacks_(0),
-      last_logged_bitrate_(0),
-      last_logged_state_(BandwidthUsage::kBwNormal),
+      prev_bitrate_(0),
+      prev_state_(BandwidthUsage::kBwNormal),
       in_sparse_update_experiment_(BweSparseUpdateExperimentIsEnabled()) {
   LOG(LS_INFO) << "Using Trendline filter for delay change estimation.";
 }
@@ -249,16 +249,18 @@
       result.recovered_from_overuse = recovered_from_overuse;
     }
   }
-  if (result.updated) {
-    BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", now_ms,
-                          result.target_bitrate_bps);
-    if (event_log_ && (result.target_bitrate_bps != last_logged_bitrate_ ||
-                       detector_.State() != last_logged_state_)) {
-      event_log_->LogDelayBasedBweUpdate(result.target_bitrate_bps,
-                                         detector_.State());
-      last_logged_bitrate_ = result.target_bitrate_bps;
-      last_logged_state_ = detector_.State();
-    }
+  if ((result.updated && prev_bitrate_ != result.target_bitrate_bps) ||
+      detector_.State() != prev_state_) {
+    uint32_t bitrate_bps =
+        result.updated ? result.target_bitrate_bps : prev_bitrate_;
+
+    BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", now_ms, bitrate_bps);
+
+    if (event_log_)
+      event_log_->LogDelayBasedBweUpdate(bitrate_bps, detector_.State());
+
+    prev_bitrate_ = bitrate_bps;
+    prev_state_ = detector_.State();
   }
   return result;
 }

modules/congestion_controller/delay_based_bwe.h

diff --git a/modules/congestion_controller/delay_based_bwe.h b/modules/congestion_controller/delay_based_bwe.h
index c0820e1..3766cd1 100644
--- a/modules/congestion_controller/delay_based_bwe.h
+++ b/modules/congestion_controller/delay_based_bwe.h
@@ -85,8 +85,8 @@
   double trendline_smoothing_coeff_;
   double trendline_threshold_gain_;
   int consecutive_delayed_feedbacks_;
-  uint32_t last_logged_bitrate_;
-  BandwidthUsage last_logged_state_;
+  uint32_t prev_bitrate_;
+  BandwidthUsage prev_state_;
   bool in_sparse_update_experiment_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayBasedBwe);