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

Stop adding RTT delay if there was not packet loss for enough time

Browse Source 
Bug: none
Change-Id: I9105c0ee6a4f75381e133a496c3728dece9aca4b
Reviewed-on: https://webrtc-review.googlesource.com/c/23261
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25309}
This commit is contained in:
Gustavo Garcia 2018-01-08 15:23:38 +01:00 committed by Commit Bot
parent 0627e21a1a
commit f7a7c8a8bc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/jitter_estimator.cc
View File

@ -26,6 +26,7 @@ namespace webrtc {
enum { kStartupDelaySamples = 30 };
enum { kFsAccuStartupSamples = 5 };
enum { kMaxFramerateEstimate = 200 };
enum { kNackCountTimeoutMs = 60000 };
VCMJitterEstimator::VCMJitterEstimator(const Clock* clock,
int32_t vcmId,
@ -102,6 +103,7 @@ void VCMJitterEstimator::Reset() {
_filterJitterEstimate = 0.0;
_latestNackTimestamp = 0;
_nackCount = 0;
_latestNackTimestamp = 0;
_fsSum = 0;
_fsCount = 0;
_startupCount = 0;
@ -193,15 +195,10 @@ void VCMJitterEstimator::UpdateEstimate(int64_t frameDelayMS,
// Updates the nack/packet ratio
void VCMJitterEstimator::FrameNacked() {
// Wait until _nackLimit retransmissions has been received,
// then always add ~1 RTT delay.
// TODO(holmer): Should we ever remove the additional delay if the
// the packet losses seem to have stopped? We could for instance scale
// the number of RTTs to add with the amount of retransmissions in a given
// time interval, or similar.
if (_nackCount < _nackLimit) {
_nackCount++;
}
_latestNackTimestamp = clock_->TimeInMicroseconds();
}
// Updates Kalman estimate of the channel
@ -386,6 +383,11 @@ void VCMJitterEstimator::UpdateMaxFrameSize(uint32_t frameSizeBytes) {
// otherwise tries to calculate an estimate.
int VCMJitterEstimator::GetJitterEstimate(double rttMultiplier) {
double jitterMS = CalculateEstimate() + OPERATING_SYSTEM_JITTER;
uint64_t now = clock_->TimeInMicroseconds();
if (now - _latestNackTimestamp > kNackCountTimeoutMs * 1000)
_nackCount = 0;
if (_filterJitterEstimate > jitterMS)
jitterMS = _filterJitterEstimate;
if (_nackCount >= _nackLimit)