2012-04-19 12:13:52 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2013-07-16 12:54:53 +00:00
|
|
|
#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2016-01-24 23:05:21 -08:00
|
|
|
#include <algorithm>
|
2014-03-21 16:51:01 +00:00
|
|
|
#include <cmath>
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2015-03-26 11:11:06 +01:00
|
|
|
#include "webrtc/base/checks.h"
|
2015-12-04 16:13:05 +01:00
|
|
|
#include "webrtc/base/logging.h"
|
2015-10-28 18:17:40 +01:00
|
|
|
#include "webrtc/system_wrappers/include/field_trial.h"
|
|
|
|
|
#include "webrtc/system_wrappers/include/metrics.h"
|
2015-11-05 12:02:15 -08:00
|
|
|
#include "webrtc/call/rtc_event_log.h"
|
2012-04-19 12:13:52 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
2014-03-21 16:51:01 +00:00
|
|
|
namespace {
|
2015-03-26 11:11:06 +01:00
|
|
|
const int64_t kBweIncreaseIntervalMs = 1000;
|
|
|
|
|
const int64_t kBweDecreaseIntervalMs = 300;
|
|
|
|
|
const int64_t kStartPhaseMs = 2000;
|
|
|
|
|
const int64_t kBweConverganceTimeMs = 20000;
|
|
|
|
|
const int kLimitNumPackets = 20;
|
|
|
|
|
const int kDefaultMinBitrateBps = 10000;
|
|
|
|
|
const int kDefaultMaxBitrateBps = 1000000000;
|
2015-09-04 03:04:56 -07:00
|
|
|
const int64_t kLowBitrateLogPeriodMs = 10000;
|
2014-03-21 16:51:01 +00:00
|
|
|
|
2015-01-19 15:44:47 +00:00
|
|
|
struct UmaRampUpMetric {
|
|
|
|
|
const char* metric_name;
|
|
|
|
|
int bitrate_kbps;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const UmaRampUpMetric kUmaRampupMetrics[] = {
|
|
|
|
|
{"WebRTC.BWE.RampUpTimeTo500kbpsInMs", 500},
|
|
|
|
|
{"WebRTC.BWE.RampUpTimeTo1000kbpsInMs", 1000},
|
|
|
|
|
{"WebRTC.BWE.RampUpTimeTo2000kbpsInMs", 2000}};
|
|
|
|
|
const size_t kNumUmaRampupMetrics =
|
|
|
|
|
sizeof(kUmaRampupMetrics) / sizeof(kUmaRampupMetrics[0]);
|
|
|
|
|
|
2016-01-24 23:05:21 -08:00
|
|
|
} // namespace
|
2012-04-19 12:13:52 +00:00
|
|
|
|
Revert of Move RtcEventLog object from inside VoiceEngine to Call. (patchset #16 id:420001 of https://codereview.webrtc.org/1748403002/ )
Reason for revert:
Reverting all CLs related to moving the eventlog, as they break Chromium tests.
Original issue's description:
> Move RtcEventLog object from inside VoiceEngine to Call.
>
> In addition to moving the logging object itself, this also moves the interface from PeerConnectionFactory to PeerConnection, which makes more sense for this functionality. An API parameter to set an upper limit to the size of the logfile is introduced.
> The old interface on PeerConnectionFactory is not removed in this CL, because it is called from Chrome, it will be removed after Chrome is updated to use the PeerConnection interface.
>
> BUG=webrtc:4741,webrtc:5603,chromium:609749
> R=solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org, tommi@webrtc.org
>
> Committed: https://crrev.com/1895526c6130e3d0e9b154f95079b8eda7567016
> Cr-Commit-Position: refs/heads/master@{#13321}
TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4741,webrtc:5603,chromium:609749
Review-Url: https://codereview.webrtc.org/2111813002
Cr-Commit-Position: refs/heads/master@{#13340}
2016-06-30 00:59:43 -07:00
|
|
|
SendSideBandwidthEstimation::SendSideBandwidthEstimation()
|
2015-10-22 08:52:20 -07:00
|
|
|
: lost_packets_since_last_loss_update_Q8_(0),
|
|
|
|
|
expected_packets_since_last_loss_update_(0),
|
2012-04-19 12:13:52 +00:00
|
|
|
bitrate_(0),
|
2015-03-26 11:11:06 +01:00
|
|
|
min_bitrate_configured_(kDefaultMinBitrateBps),
|
|
|
|
|
max_bitrate_configured_(kDefaultMaxBitrateBps),
|
2015-09-04 03:04:56 -07:00
|
|
|
last_low_bitrate_log_ms_(-1),
|
2015-10-22 08:52:20 -07:00
|
|
|
has_decreased_since_last_fraction_loss_(false),
|
|
|
|
|
time_last_receiver_block_ms_(-1),
|
2012-04-19 12:13:52 +00:00
|
|
|
last_fraction_loss_(0),
|
2014-03-26 21:00:21 +00:00
|
|
|
last_round_trip_time_ms_(0),
|
2012-04-19 12:13:52 +00:00
|
|
|
bwe_incoming_(0),
|
2016-01-20 07:13:58 -08:00
|
|
|
delay_based_bitrate_bps_(0),
|
2014-10-23 11:57:05 +00:00
|
|
|
time_last_decrease_ms_(0),
|
2014-11-03 14:42:43 +00:00
|
|
|
first_report_time_ms_(-1),
|
|
|
|
|
initially_lost_packets_(0),
|
2014-11-04 19:32:10 +00:00
|
|
|
bitrate_at_2_seconds_kbps_(0),
|
2015-01-19 15:44:47 +00:00
|
|
|
uma_update_state_(kNoUpdate),
|
2015-11-05 12:02:15 -08:00
|
|
|
rampup_uma_stats_updated_(kNumUmaRampupMetrics, false),
|
Revert of Move RtcEventLog object from inside VoiceEngine to Call. (patchset #16 id:420001 of https://codereview.webrtc.org/1748403002/ )
Reason for revert:
Reverting all CLs related to moving the eventlog, as they break Chromium tests.
Original issue's description:
> Move RtcEventLog object from inside VoiceEngine to Call.
>
> In addition to moving the logging object itself, this also moves the interface from PeerConnectionFactory to PeerConnection, which makes more sense for this functionality. An API parameter to set an upper limit to the size of the logfile is introduced.
> The old interface on PeerConnectionFactory is not removed in this CL, because it is called from Chrome, it will be removed after Chrome is updated to use the PeerConnection interface.
>
> BUG=webrtc:4741,webrtc:5603,chromium:609749
> R=solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org, tommi@webrtc.org
>
> Committed: https://crrev.com/1895526c6130e3d0e9b154f95079b8eda7567016
> Cr-Commit-Position: refs/heads/master@{#13321}
TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4741,webrtc:5603,chromium:609749
Review-Url: https://codereview.webrtc.org/2111813002
Cr-Commit-Position: refs/heads/master@{#13340}
2016-06-30 00:59:43 -07:00
|
|
|
event_log_(nullptr) {}
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2014-03-21 14:00:51 +00:00
|
|
|
SendSideBandwidthEstimation::~SendSideBandwidthEstimation() {}
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2016-04-28 15:52:49 +02:00
|
|
|
void SendSideBandwidthEstimation::SetBitrates(int send_bitrate,
|
|
|
|
|
int min_bitrate,
|
|
|
|
|
int max_bitrate) {
|
|
|
|
|
if (send_bitrate > 0)
|
|
|
|
|
SetSendBitrate(send_bitrate);
|
|
|
|
|
SetMinMaxBitrate(min_bitrate, max_bitrate);
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:11:06 +01:00
|
|
|
void SendSideBandwidthEstimation::SetSendBitrate(int bitrate) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK_GT(bitrate, 0);
|
2012-04-19 12:13:52 +00:00
|
|
|
bitrate_ = bitrate;
|
2014-03-26 21:00:21 +00:00
|
|
|
|
|
|
|
|
// Clear last sent bitrate history so the new value can be used directly
|
|
|
|
|
// and not capped.
|
|
|
|
|
min_bitrate_history_.clear();
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:11:06 +01:00
|
|
|
void SendSideBandwidthEstimation::SetMinMaxBitrate(int min_bitrate,
|
|
|
|
|
int max_bitrate) {
|
2015-09-17 00:24:34 -07:00
|
|
|
RTC_DCHECK_GE(min_bitrate, 0);
|
2015-03-26 11:11:06 +01:00
|
|
|
min_bitrate_configured_ = std::max(min_bitrate, kDefaultMinBitrateBps);
|
|
|
|
|
if (max_bitrate > 0) {
|
|
|
|
|
max_bitrate_configured_ =
|
|
|
|
|
std::max<uint32_t>(min_bitrate_configured_, max_bitrate);
|
|
|
|
|
} else {
|
|
|
|
|
max_bitrate_configured_ = kDefaultMaxBitrateBps;
|
|
|
|
|
}
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:11:06 +01:00
|
|
|
int SendSideBandwidthEstimation::GetMinBitrate() const {
|
2015-03-04 12:24:26 +00:00
|
|
|
return min_bitrate_configured_;
|
2014-03-06 07:19:28 +00:00
|
|
|
}
|
|
|
|
|
|
2015-03-26 11:11:06 +01:00
|
|
|
void SendSideBandwidthEstimation::CurrentEstimate(int* bitrate,
|
2014-03-21 16:51:01 +00:00
|
|
|
uint8_t* loss,
|
2015-01-12 21:51:21 +00:00
|
|
|
int64_t* rtt) const {
|
2014-03-21 16:51:01 +00:00
|
|
|
*bitrate = bitrate_;
|
|
|
|
|
*loss = last_fraction_loss_;
|
2014-03-26 21:00:21 +00:00
|
|
|
*rtt = last_round_trip_time_ms_;
|
2014-03-21 16:51:01 +00:00
|
|
|
}
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2015-09-04 03:04:56 -07:00
|
|
|
void SendSideBandwidthEstimation::UpdateReceiverEstimate(
|
|
|
|
|
int64_t now_ms, uint32_t bandwidth) {
|
2014-03-21 16:51:01 +00:00
|
|
|
bwe_incoming_ = bandwidth;
|
2015-09-04 03:04:56 -07:00
|
|
|
bitrate_ = CapBitrateToThresholds(now_ms, bitrate_);
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
|
|
|
|
|
2016-01-20 07:13:58 -08:00
|
|
|
void SendSideBandwidthEstimation::UpdateDelayBasedEstimate(
|
|
|
|
|
int64_t now_ms,
|
|
|
|
|
uint32_t bitrate_bps) {
|
|
|
|
|
delay_based_bitrate_bps_ = bitrate_bps;
|
|
|
|
|
bitrate_ = CapBitrateToThresholds(now_ms, bitrate_);
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-21 16:51:01 +00:00
|
|
|
void SendSideBandwidthEstimation::UpdateReceiverBlock(uint8_t fraction_loss,
|
2015-01-12 21:51:21 +00:00
|
|
|
int64_t rtt,
|
2014-03-21 16:51:01 +00:00
|
|
|
int number_of_packets,
|
2014-12-08 19:46:23 +00:00
|
|
|
int64_t now_ms) {
|
2014-11-10 13:55:16 +00:00
|
|
|
if (first_report_time_ms_ == -1)
|
|
|
|
|
first_report_time_ms_ = now_ms;
|
|
|
|
|
|
2012-04-19 12:13:52 +00:00
|
|
|
// Update RTT.
|
2014-03-26 21:00:21 +00:00
|
|
|
last_round_trip_time_ms_ = rtt;
|
2012-04-19 12:13:52 +00:00
|
|
|
|
|
|
|
|
// Check sequence number diff and weight loss report
|
|
|
|
|
if (number_of_packets > 0) {
|
|
|
|
|
// Calculate number of lost packets.
|
2014-03-21 16:51:01 +00:00
|
|
|
const int num_lost_packets_Q8 = fraction_loss * number_of_packets;
|
2012-04-19 12:13:52 +00:00
|
|
|
// Accumulate reports.
|
2015-10-22 08:52:20 -07:00
|
|
|
lost_packets_since_last_loss_update_Q8_ += num_lost_packets_Q8;
|
|
|
|
|
expected_packets_since_last_loss_update_ += number_of_packets;
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2015-10-22 08:52:20 -07:00
|
|
|
// Don't generate a loss rate until it can be based on enough packets.
|
|
|
|
|
if (expected_packets_since_last_loss_update_ < kLimitNumPackets)
|
2014-03-21 16:51:01 +00:00
|
|
|
return;
|
2015-10-22 08:52:20 -07:00
|
|
|
|
|
|
|
|
has_decreased_since_last_fraction_loss_ = false;
|
|
|
|
|
last_fraction_loss_ = lost_packets_since_last_loss_update_Q8_ /
|
|
|
|
|
expected_packets_since_last_loss_update_;
|
|
|
|
|
|
|
|
|
|
// Reset accumulators.
|
|
|
|
|
lost_packets_since_last_loss_update_Q8_ = 0;
|
|
|
|
|
expected_packets_since_last_loss_update_ = 0;
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
2014-03-26 21:00:21 +00:00
|
|
|
time_last_receiver_block_ms_ = now_ms;
|
2014-03-21 16:51:01 +00:00
|
|
|
UpdateEstimate(now_ms);
|
2014-11-10 13:55:16 +00:00
|
|
|
UpdateUmaStats(now_ms, rtt, (fraction_loss * number_of_packets) >> 8);
|
2014-11-04 19:32:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SendSideBandwidthEstimation::UpdateUmaStats(int64_t now_ms,
|
2015-01-12 21:51:21 +00:00
|
|
|
int64_t rtt,
|
2014-11-04 19:32:10 +00:00
|
|
|
int lost_packets) {
|
2015-01-19 15:44:47 +00:00
|
|
|
int bitrate_kbps = static_cast<int>((bitrate_ + 500) / 1000);
|
|
|
|
|
for (size_t i = 0; i < kNumUmaRampupMetrics; ++i) {
|
|
|
|
|
if (!rampup_uma_stats_updated_[i] &&
|
|
|
|
|
bitrate_kbps >= kUmaRampupMetrics[i].bitrate_kbps) {
|
2016-03-29 02:15:06 -07:00
|
|
|
RTC_LOGGED_HISTOGRAMS_COUNTS_100000(i, kUmaRampupMetrics[i].metric_name,
|
|
|
|
|
now_ms - first_report_time_ms_);
|
2015-01-19 15:44:47 +00:00
|
|
|
rampup_uma_stats_updated_[i] = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-11-04 19:32:10 +00:00
|
|
|
if (IsInStartPhase(now_ms)) {
|
|
|
|
|
initially_lost_packets_ += lost_packets;
|
|
|
|
|
} else if (uma_update_state_ == kNoUpdate) {
|
|
|
|
|
uma_update_state_ = kFirstDone;
|
2015-01-19 15:44:47 +00:00
|
|
|
bitrate_at_2_seconds_kbps_ = bitrate_kbps;
|
2016-03-29 02:15:06 -07:00
|
|
|
RTC_LOGGED_HISTOGRAM_COUNTS("WebRTC.BWE.InitiallyLostPackets",
|
|
|
|
|
initially_lost_packets_, 0, 100, 50);
|
|
|
|
|
RTC_LOGGED_HISTOGRAM_COUNTS("WebRTC.BWE.InitialRtt", static_cast<int>(rtt),
|
|
|
|
|
0, 2000, 50);
|
|
|
|
|
RTC_LOGGED_HISTOGRAM_COUNTS("WebRTC.BWE.InitialBandwidthEstimate",
|
|
|
|
|
bitrate_at_2_seconds_kbps_, 0, 2000, 50);
|
2014-11-04 19:32:10 +00:00
|
|
|
} else if (uma_update_state_ == kFirstDone &&
|
|
|
|
|
now_ms - first_report_time_ms_ >= kBweConverganceTimeMs) {
|
|
|
|
|
uma_update_state_ = kDone;
|
2015-01-19 15:44:47 +00:00
|
|
|
int bitrate_diff_kbps =
|
|
|
|
|
std::max(bitrate_at_2_seconds_kbps_ - bitrate_kbps, 0);
|
2016-03-29 02:15:06 -07:00
|
|
|
RTC_LOGGED_HISTOGRAM_COUNTS("WebRTC.BWE.InitialVsConvergedDiff",
|
|
|
|
|
bitrate_diff_kbps, 0, 2000, 50);
|
2014-11-03 14:42:43 +00:00
|
|
|
}
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
|
|
|
|
|
2014-12-08 19:46:23 +00:00
|
|
|
void SendSideBandwidthEstimation::UpdateEstimate(int64_t now_ms) {
|
2016-01-21 08:55:03 -08:00
|
|
|
// We trust the REMB and/or delay-based estimate during the first 2 seconds if
|
|
|
|
|
// we haven't had any packet loss reported, to allow startup bitrate probing.
|
|
|
|
|
if (last_fraction_loss_ == 0 && IsInStartPhase(now_ms)) {
|
|
|
|
|
uint32_t prev_bitrate = bitrate_;
|
|
|
|
|
if (bwe_incoming_ > bitrate_)
|
|
|
|
|
bitrate_ = CapBitrateToThresholds(now_ms, bwe_incoming_);
|
|
|
|
|
if (delay_based_bitrate_bps_ > bitrate_)
|
|
|
|
|
bitrate_ = CapBitrateToThresholds(now_ms, delay_based_bitrate_bps_);
|
|
|
|
|
if (bitrate_ != prev_bitrate) {
|
|
|
|
|
min_bitrate_history_.clear();
|
|
|
|
|
min_bitrate_history_.push_back(std::make_pair(now_ms, bitrate_));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2014-10-23 11:57:05 +00:00
|
|
|
}
|
2014-03-26 21:00:21 +00:00
|
|
|
UpdateMinHistory(now_ms);
|
|
|
|
|
// Only start updating bitrate when receiving receiver blocks.
|
2015-10-22 08:52:20 -07:00
|
|
|
// TODO(pbos): Handle the case when no receiver report is received for a very
|
|
|
|
|
// long time.
|
|
|
|
|
if (time_last_receiver_block_ms_ != -1) {
|
2014-03-26 21:00:21 +00:00
|
|
|
if (last_fraction_loss_ <= 5) {
|
|
|
|
|
// Loss < 2%: Increase rate by 8% of the min bitrate in the last
|
|
|
|
|
// kBweIncreaseIntervalMs.
|
|
|
|
|
// Note that by remembering the bitrate over the last second one can
|
|
|
|
|
// rampup up one second faster than if only allowed to start ramping
|
|
|
|
|
// at 8% per second rate now. E.g.:
|
|
|
|
|
// If sending a constant 100kbps it can rampup immediatly to 108kbps
|
|
|
|
|
// whenever a receiver report is received with lower packet loss.
|
|
|
|
|
// If instead one would do: bitrate_ *= 1.08^(delta time), it would
|
|
|
|
|
// take over one second since the lower packet loss to achieve 108kbps.
|
|
|
|
|
bitrate_ = static_cast<uint32_t>(
|
|
|
|
|
min_bitrate_history_.front().second * 1.08 + 0.5);
|
2012-04-19 12:13:52 +00:00
|
|
|
|
2014-03-21 16:51:01 +00:00
|
|
|
// Add 1 kbps extra, just to make sure that we do not get stuck
|
|
|
|
|
// (gives a little extra increase at low rates, negligible at higher
|
|
|
|
|
// rates).
|
|
|
|
|
bitrate_ += 1000;
|
2012-04-19 12:13:52 +00:00
|
|
|
|
Revert of Move RtcEventLog object from inside VoiceEngine to Call. (patchset #16 id:420001 of https://codereview.webrtc.org/1748403002/ )
Reason for revert:
Reverting all CLs related to moving the eventlog, as they break Chromium tests.
Original issue's description:
> Move RtcEventLog object from inside VoiceEngine to Call.
>
> In addition to moving the logging object itself, this also moves the interface from PeerConnectionFactory to PeerConnection, which makes more sense for this functionality. An API parameter to set an upper limit to the size of the logfile is introduced.
> The old interface on PeerConnectionFactory is not removed in this CL, because it is called from Chrome, it will be removed after Chrome is updated to use the PeerConnection interface.
>
> BUG=webrtc:4741,webrtc:5603,chromium:609749
> R=solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org, tommi@webrtc.org
>
> Committed: https://crrev.com/1895526c6130e3d0e9b154f95079b8eda7567016
> Cr-Commit-Position: refs/heads/master@{#13321}
TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4741,webrtc:5603,chromium:609749
Review-Url: https://codereview.webrtc.org/2111813002
Cr-Commit-Position: refs/heads/master@{#13340}
2016-06-30 00:59:43 -07:00
|
|
|
if (event_log_) {
|
|
|
|
|
event_log_->LogBwePacketLossEvent(
|
|
|
|
|
bitrate_, last_fraction_loss_,
|
|
|
|
|
expected_packets_since_last_loss_update_);
|
|
|
|
|
}
|
2014-03-26 21:00:21 +00:00
|
|
|
} else if (last_fraction_loss_ <= 26) {
|
|
|
|
|
// Loss between 2% - 10%: Do nothing.
|
|
|
|
|
} else {
|
|
|
|
|
// Loss > 10%: Limit the rate decreases to once a kBweDecreaseIntervalMs +
|
|
|
|
|
// rtt.
|
2015-10-22 08:52:20 -07:00
|
|
|
if (!has_decreased_since_last_fraction_loss_ &&
|
|
|
|
|
(now_ms - time_last_decrease_ms_) >=
|
|
|
|
|
(kBweDecreaseIntervalMs + last_round_trip_time_ms_)) {
|
2014-03-26 21:00:21 +00:00
|
|
|
time_last_decrease_ms_ = now_ms;
|
|
|
|
|
|
|
|
|
|
// Reduce rate:
|
|
|
|
|
// newRate = rate * (1 - 0.5*lossRate);
|
|
|
|
|
// where packetLoss = 256*lossRate;
|
|
|
|
|
bitrate_ = static_cast<uint32_t>(
|
|
|
|
|
(bitrate_ * static_cast<double>(512 - last_fraction_loss_)) /
|
|
|
|
|
512.0);
|
2015-10-22 08:52:20 -07:00
|
|
|
has_decreased_since_last_fraction_loss_ = true;
|
2014-03-26 21:00:21 +00:00
|
|
|
}
|
Revert of Move RtcEventLog object from inside VoiceEngine to Call. (patchset #16 id:420001 of https://codereview.webrtc.org/1748403002/ )
Reason for revert:
Reverting all CLs related to moving the eventlog, as they break Chromium tests.
Original issue's description:
> Move RtcEventLog object from inside VoiceEngine to Call.
>
> In addition to moving the logging object itself, this also moves the interface from PeerConnectionFactory to PeerConnection, which makes more sense for this functionality. An API parameter to set an upper limit to the size of the logfile is introduced.
> The old interface on PeerConnectionFactory is not removed in this CL, because it is called from Chrome, it will be removed after Chrome is updated to use the PeerConnection interface.
>
> BUG=webrtc:4741,webrtc:5603,chromium:609749
> R=solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org, tommi@webrtc.org
>
> Committed: https://crrev.com/1895526c6130e3d0e9b154f95079b8eda7567016
> Cr-Commit-Position: refs/heads/master@{#13321}
TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4741,webrtc:5603,chromium:609749
Review-Url: https://codereview.webrtc.org/2111813002
Cr-Commit-Position: refs/heads/master@{#13340}
2016-06-30 00:59:43 -07:00
|
|
|
if (event_log_) {
|
|
|
|
|
event_log_->LogBwePacketLossEvent(
|
|
|
|
|
bitrate_, last_fraction_loss_,
|
|
|
|
|
expected_packets_since_last_loss_update_);
|
|
|
|
|
}
|
2014-03-26 21:00:21 +00:00
|
|
|
}
|
|
|
|
|
}
|
2015-09-04 03:04:56 -07:00
|
|
|
bitrate_ = CapBitrateToThresholds(now_ms, bitrate_);
|
2014-03-26 21:00:21 +00:00
|
|
|
}
|
2014-03-21 16:51:01 +00:00
|
|
|
|
2014-11-03 14:42:43 +00:00
|
|
|
bool SendSideBandwidthEstimation::IsInStartPhase(int64_t now_ms) const {
|
|
|
|
|
return first_report_time_ms_ == -1 ||
|
|
|
|
|
now_ms - first_report_time_ms_ < kStartPhaseMs;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-08 19:46:23 +00:00
|
|
|
void SendSideBandwidthEstimation::UpdateMinHistory(int64_t now_ms) {
|
2014-03-26 21:00:21 +00:00
|
|
|
// Remove old data points from history.
|
|
|
|
|
// Since history precision is in ms, add one so it is able to increase
|
|
|
|
|
// bitrate if it is off by as little as 0.5ms.
|
|
|
|
|
while (!min_bitrate_history_.empty() &&
|
|
|
|
|
now_ms - min_bitrate_history_.front().first + 1 >
|
|
|
|
|
kBweIncreaseIntervalMs) {
|
|
|
|
|
min_bitrate_history_.pop_front();
|
|
|
|
|
}
|
2014-03-21 16:51:01 +00:00
|
|
|
|
2014-03-26 21:00:21 +00:00
|
|
|
// Typical minimum sliding-window algorithm: Pop values higher than current
|
|
|
|
|
// bitrate before pushing it.
|
|
|
|
|
while (!min_bitrate_history_.empty() &&
|
|
|
|
|
bitrate_ <= min_bitrate_history_.back().second) {
|
|
|
|
|
min_bitrate_history_.pop_back();
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
|
|
|
|
|
2014-03-26 21:00:21 +00:00
|
|
|
min_bitrate_history_.push_back(std::make_pair(now_ms, bitrate_));
|
2014-03-17 17:07:48 +00:00
|
|
|
}
|
|
|
|
|
|
2015-09-04 03:04:56 -07:00
|
|
|
uint32_t SendSideBandwidthEstimation::CapBitrateToThresholds(
|
|
|
|
|
int64_t now_ms, uint32_t bitrate) {
|
2014-10-23 11:57:05 +00:00
|
|
|
if (bwe_incoming_ > 0 && bitrate > bwe_incoming_) {
|
|
|
|
|
bitrate = bwe_incoming_;
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
2016-01-20 07:13:58 -08:00
|
|
|
if (delay_based_bitrate_bps_ > 0 && bitrate > delay_based_bitrate_bps_) {
|
|
|
|
|
bitrate = delay_based_bitrate_bps_;
|
|
|
|
|
}
|
2014-10-23 11:57:05 +00:00
|
|
|
if (bitrate > max_bitrate_configured_) {
|
|
|
|
|
bitrate = max_bitrate_configured_;
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
2014-10-23 11:57:05 +00:00
|
|
|
if (bitrate < min_bitrate_configured_) {
|
2015-09-04 03:04:56 -07:00
|
|
|
if (last_low_bitrate_log_ms_ == -1 ||
|
|
|
|
|
now_ms - last_low_bitrate_log_ms_ > kLowBitrateLogPeriodMs) {
|
|
|
|
|
LOG(LS_WARNING) << "Estimated available bandwidth " << bitrate / 1000
|
|
|
|
|
<< " kbps is below configured min bitrate "
|
|
|
|
|
<< min_bitrate_configured_ / 1000 << " kbps.";
|
|
|
|
|
last_low_bitrate_log_ms_ = now_ms;
|
|
|
|
|
}
|
2014-10-23 11:57:05 +00:00
|
|
|
bitrate = min_bitrate_configured_;
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
2014-10-23 11:57:05 +00:00
|
|
|
return bitrate;
|
2012-04-19 12:13:52 +00:00
|
|
|
}
|
Revert of Move RtcEventLog object from inside VoiceEngine to Call. (patchset #16 id:420001 of https://codereview.webrtc.org/1748403002/ )
Reason for revert:
Reverting all CLs related to moving the eventlog, as they break Chromium tests.
Original issue's description:
> Move RtcEventLog object from inside VoiceEngine to Call.
>
> In addition to moving the logging object itself, this also moves the interface from PeerConnectionFactory to PeerConnection, which makes more sense for this functionality. An API parameter to set an upper limit to the size of the logfile is introduced.
> The old interface on PeerConnectionFactory is not removed in this CL, because it is called from Chrome, it will be removed after Chrome is updated to use the PeerConnection interface.
>
> BUG=webrtc:4741,webrtc:5603,chromium:609749
> R=solenberg@webrtc.org, stefan@webrtc.org, terelius@webrtc.org, tommi@webrtc.org
>
> Committed: https://crrev.com/1895526c6130e3d0e9b154f95079b8eda7567016
> Cr-Commit-Position: refs/heads/master@{#13321}
TBR=solenberg@webrtc.org,tommi@webrtc.org,stefan@webrtc.org,terelius@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4741,webrtc:5603,chromium:609749
Review-Url: https://codereview.webrtc.org/2111813002
Cr-Commit-Position: refs/heads/master@{#13340}
2016-06-30 00:59:43 -07:00
|
|
|
|
|
|
|
|
void SendSideBandwidthEstimation::SetEventLog(RtcEventLog* event_log) {
|
|
|
|
|
event_log_ = event_log;
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-19 12:13:52 +00:00
|
|
|
} // namespace webrtc
|