zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add ability to cap the video jitter estimate to a max value."

Browse Source 
This reverts commit a8ae407a480a2a9982eecf9e3a9b10da5373cd9a.

Reason for revert: This CL incorrectly affects non-experiment branch.  A new CL affecting only the experiment will be uploaded.

Original change's description:
> Add ability to cap the video jitter estimate to a max value.
>
> Bug: webrtc:10572
> Change-Id: I21112824dc02afa71db61bb8c2f02723e8b325b6
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133963
> Commit-Queue: Michael Horowitz <mhoro@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27744}

TBR=stefan@webrtc.org,mhoro@webrtc.org

Bug: webrtc:10572
Change-Id: I4af334168ca70ecfae7fd18fc7c852819a98d866
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138063
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Michael Horowitz <mhoro@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28025}
This commit is contained in:
Stefan Holmer
2019-05-22 16:06:14 +02:00
committed by Commit Bot
parent 040dc4388b
commit 4ed7e511f6
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/video_coding/jitter_estimator.cc
View File

@ -374,8 +374,7 @@ void VCMJitterEstimator::UpdateRtt(int64_t rttMs) {
// Returns the current filtered estimate if available,
// otherwise tries to calculate an estimate.
int VCMJitterEstimator::GetJitterEstimate(double rttMultiplier,
double jitterEstCapMs) {
int VCMJitterEstimator::GetJitterEstimate(double rttMultiplier) {
double jitterMS = CalculateEstimate() + OPERATING_SYSTEM_JITTER;
uint64_t now = clock_->TimeInMicroseconds();
@ -384,10 +383,8 @@ int VCMJitterEstimator::GetJitterEstimate(double rttMultiplier,
if (_filterJitterEstimate > jitterMS)
jitterMS = _filterJitterEstimate;
if (_nackCount >= _nackLimit) {
if (_nackCount >= _nackLimit)
jitterMS += _rttFilter.RttMs() * rttMultiplier;
jitterMS = std::min(jitterMS, jitterEstCapMs);
}
static const double kJitterScaleLowThreshold = 5.0;
static const double kJitterScaleHighThreshold = 10.0;