Jitter delay now depend on protection mode (FEC/NACK).
R=stefan@webrtc.org
Review URL: https://codereview.webrtc.org/1942683003 .
Cr-Commit-Position: refs/heads/master@{#12661}
diff --git a/webrtc/modules/video_coding/jitter_buffer.cc b/webrtc/modules/video_coding/jitter_buffer.cc
index b70f44f..9c50a94 100644
--- a/webrtc/modules/video_coding/jitter_buffer.cc
+++ b/webrtc/modules/video_coding/jitter_buffer.cc
@@ -601,7 +601,8 @@
// Frame pulled out from jitter buffer, update the jitter estimate.
const bool retransmitted = (frame->GetNackCount() > 0);
if (retransmitted) {
- jitter_estimate_.FrameNacked();
+ if (WaitForRetransmissions())
+ jitter_estimate_.FrameNacked();
} else if (frame->Length() > 0) {
// Ignore retransmitted and empty frames.
if (waiting_for_completion_.latest_packet_time >= 0) {
@@ -958,6 +959,8 @@
jitter_estimate_.UpdateRtt(rtt_ms);
if (nack_module_)
nack_module_->UpdateRtt(rtt_ms);
+ if (!WaitForRetransmissions())
+ jitter_estimate_.ResetNackCount();
}
void VCMJitterBuffer::SetNackMode(VCMNackMode mode,