Index: webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc |
index 83917912e8824ce34d186d5dab470e1b52e38dd8..03f76714bb913f3a20d2c18b98153a63306afa1b 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc |
@@ -20,6 +20,8 @@ |
#include "webrtc/base/logging.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" |
+#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" |
+ |
namespace webrtc { |
enum { kMinFramePeriodHistoryLength = 60 }; |
@@ -48,9 +50,11 @@ OveruseEstimator::~OveruseEstimator() { |
void OveruseEstimator::Update(int64_t t_delta, |
double ts_delta, |
int size_delta, |
- BandwidthUsage current_hypothesis) { |
+ BandwidthUsage current_hypothesis, |
+ int64_t now_ms) { |
const double min_frame_period = UpdateMinFramePeriod(ts_delta); |
const double t_ts_delta = t_delta - ts_delta; |
+ BWE_TEST_LOGGING_PLOT(1, "dm[ms]", now_ms, t_ts_delta); |
stefan-webrtc
2016/09/01 14:07:36
what does dm mean?
Gaetano Carlucci
2016/09/01 16:06:26
The m stands for measured. It differentiates with
|
double fs_delta = size_delta; |
++num_of_deltas_; |
@@ -71,6 +75,8 @@ void OveruseEstimator::Update(int64_t t_delta, |
const double Eh[2] = {E_[0][0]*h[0] + E_[0][1]*h[1], |
E_[1][0]*h[0] + E_[1][1]*h[1]}; |
+ BWE_TEST_LOGGING_PLOT(1, "d[ms]", now_ms, slope_*h[0] - offset_); |
+ |
const double residual = t_ts_delta - slope_*h[0] - offset_; |
const bool in_stable_state = (current_hypothesis == kBwNormal); |
@@ -112,6 +118,11 @@ void OveruseEstimator::Update(int64_t t_delta, |
slope_ = slope_ + K[0] * residual; |
prev_offset_ = offset_; |
offset_ = offset_ + K[1] * residual; |
+ |
+ BWE_TEST_LOGGING_PLOT(1, "kc", now_ms, K[0]); |
+ BWE_TEST_LOGGING_PLOT(1, "km", now_ms, K[1]); |
+ BWE_TEST_LOGGING_PLOT(1, "slope[1/bps]", now_ms, slope_); |
+ BWE_TEST_LOGGING_PLOT(1, "var_noise", now_ms, var_noise_); |
} |
double OveruseEstimator::UpdateMinFramePeriod(double ts_delta) { |