admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove OverUseDetectorOptions from OveruseDetector since it isn't used.

Browse Source 
BUG=None

Review-Url: https://codereview.webrtc.org/2580733004
Cr-Commit-Position: refs/heads/master@{#15809}
This commit is contained in:
terelius 2016-12-27 10:43:01 -08:00 committed by Commit bot
parent 0cd111a2ed
commit 84f83f8c0c
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/common_types.h
View File

@ -708,6 +708,9 @@ class BitrateAllocation {
// Bandwidth over-use detector options. These are used to drive
// experimentation with bandwidth estimation parameters.
// See modules/remote_bitrate_estimator/overuse_detector.h
// TODO(terelius): This is only used in overuse_estimator.cc, and only in the
// default constructed state. Can we move the relevant variables into that
// class and delete this? See also disabled warning at line 27
struct OverUseDetectorOptions {
OverUseDetectorOptions()
: initial_slope(8.0 / 512.0),

2
webrtc/modules/congestion_controller/delay_based_bwe.cc
View File

@ -213,7 +213,7 @@ DelayBasedBwe::DelayBasedBwe(Clock* clock)
inter_arrival_(),
kalman_estimator_(),
trendline_estimator_(),
detector_(OverUseDetectorOptions()),
detector_(),
receiver_incoming_bitrate_(),
last_update_ms_(-1),
last_seen_packet_ms_(-1),

3
webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
View File

@ -60,14 +60,13 @@ bool ReadExperimentConstants(double* k_up, double* k_down) {
"%lf,%lf", k_up, k_down) == 2;
}
OveruseDetector::OveruseDetector(const OverUseDetectorOptions& options)
OveruseDetector::OveruseDetector()
// Experiment is on by default, but can be disabled with finch by setting
// the field trial string to "WebRTC-AdaptiveBweThreshold/Disabled/".
: in_experiment_(!AdaptiveThresholdExperimentIsDisabled()),
k_up_(0.0087),
k_down_(0.039),
overusing_time_threshold_(100),
options_(options),
threshold_(12.5),
last_update_ms_(-1),
prev_offset_(0.0),

5
webrtc/modules/remote_bitrate_estimator/overuse_detector.h
View File

@ -24,7 +24,7 @@ bool AdaptiveThresholdExperimentIsDisabled();
class OveruseDetector {
public:
explicit OveruseDetector(const OverUseDetectorOptions& options);
OveruseDetector();
virtual ~OveruseDetector();
// Update the detection state based on the estimated inter-arrival time delta
@ -49,9 +49,6 @@ class OveruseDetector {
double k_up_;
double k_down_;
double overusing_time_threshold_;
// Must be first member variable. Cannot be const because we need to be
// copyable.
webrtc::OverUseDetectorOptions options_;
double threshold_;
int64_t last_update_ms_;
double prev_offset_;

4
webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
View File

@ -42,7 +42,7 @@ class OveruseDetectorTest : public ::testing::Test {
protected:
void SetUp() override {
overuse_detector_.reset(new OveruseDetector(options_));
overuse_detector_.reset(new OveruseDetector());
}
int Run100000Samples(int packets_per_frame, size_t packet_size, int mean_ms,
@ -649,7 +649,7 @@ class OveruseDetectorExperimentTest : public OveruseDetectorTest {
protected:
void SetUp() override {
overuse_detector_.reset(new OveruseDetector(options_));
overuse_detector_.reset(new OveruseDetector());
}
test::ScopedFieldTrials override_field_trials_;

2
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
View File

@ -86,7 +86,7 @@ bool RemoteBitrateEstimatorAbsSendTime::IsWithinClusterBounds(
observer_(observer),
inter_arrival_(),
estimator_(),
detector_(OverUseDetectorOptions()),
detector_(),
incoming_bitrate_(kBitrateWindowMs, 8000),
incoming_bitrate_initialized_(false),
total_probes_received_(0),

2
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
View File

@ -38,7 +38,7 @@ struct RemoteBitrateEstimatorSingleStream::Detector {
kTimestampToMs,
enable_burst_grouping),
estimator(options),
detector(options) {}
detector() {}
int64_t last_packet_time_ms;
InterArrival inter_arrival;
OveruseEstimator estimator;