Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
index 08e076e540ad3e834b603127b8b3089413134102..e13808998277a19c190cf802b9f83a170cceb676 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
@@ -29,13 +29,12 @@ static const double kTimestampToMs = 1.0 / 90.0; |
struct RemoteBitrateEstimatorSingleStream::Detector { |
explicit Detector(int64_t last_packet_time_ms, |
- const OverUseDetectorOptions& options, |
bool enable_burst_grouping) |
: last_packet_time_ms(last_packet_time_ms), |
inter_arrival(90 * kTimestampGroupLengthMs, kTimestampToMs, |
enable_burst_grouping), |
- estimator(options), |
- detector(options) {} |
+ estimator(), |
+ detector() {} |
int64_t last_packet_time_ms; |
InterArrival inter_arrival; |
OveruseEstimator estimator; |
@@ -83,7 +82,7 @@ void RemoteBitrateEstimatorSingleStream::IncomingPacket(int64_t arrival_time_ms, |
// group. |
std::pair<SsrcOveruseEstimatorMap::iterator, bool> insert_result = |
overuse_detectors_.insert(std::make_pair( |
- ssrc, new Detector(now_ms, OverUseDetectorOptions(), true))); |
+ ssrc, new Detector(now_ms, true))); |
it = insert_result.first; |
} |
Detector* estimator = it->second; |
@@ -92,12 +91,11 @@ void RemoteBitrateEstimatorSingleStream::IncomingPacket(int64_t arrival_time_ms, |
const BandwidthUsage prior_state = estimator->detector.State(); |
uint32_t timestamp_delta = 0; |
int64_t time_delta = 0; |
- int size_delta = 0; |
if (estimator->inter_arrival.ComputeDeltas(rtp_timestamp, arrival_time_ms, |
- payload_size, ×tamp_delta, |
- &time_delta, &size_delta)) { |
+ ×tamp_delta, |
+ &time_delta)) { |
double timestamp_delta_ms = timestamp_delta * kTimestampToMs; |
- estimator->estimator.Update(time_delta, timestamp_delta_ms, size_delta, |
+ estimator->estimator.Update(time_delta, timestamp_delta_ms, |
estimator->detector.State()); |
estimator->detector.Detect(estimator->estimator.offset(), |
timestamp_delta_ms, |