Jitter delay now depend on protection mode (FEC/NACK).

webrtc/modules/video_coding/jitter_buffer.cc

 /*
  *  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.
  */
 #include "webrtc/modules/video_coding/jitter_buffer.h"
@@ skipping 583 matching lines @@
     frame = incomplete_frames_.PopFrame(timestamp);
     if (frame)
       continuous = last_decoded_state_.ContinuousFrame(frame);
     else
       return NULL;
   }
   TRACE_EVENT_ASYNC_STEP0("webrtc", "Video", timestamp, "Extract");
   // 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) {
       UpdateJitterEstimate(waiting_for_completion_, true);
     }
     if (frame->GetState() == kStateComplete) {
       UpdateJitterEstimate(*frame, false);
     } else {
       // Wait for this one to get complete.
       waiting_for_completion_.frame_size = frame->Length();
@@ skipping 336 matching lines @@
   }
   return jitter_estimate_.GetJitterEstimate(rtt_mult);
 }
 
 void VCMJitterBuffer::UpdateRtt(int64_t rtt_ms) {
   CriticalSectionScoped cs(crit_sect_);
   rtt_ms_ = rtt_ms;
   jitter_estimate_.UpdateRtt(rtt_ms);
   if (nack_module_)
     nack_module_->UpdateRtt(rtt_ms);
+  if (!WaitForRetransmissions())
+    jitter_estimate_.ResetNackCount();
 }
 
 void VCMJitterBuffer::SetNackMode(VCMNackMode mode,
                                   int64_t low_rtt_nack_threshold_ms,
                                   int64_t high_rtt_nack_threshold_ms) {
   CriticalSectionScoped cs(crit_sect_);
   nack_mode_ = mode;
   if (mode == kNoNack) {
     missing_sequence_numbers_.clear();
   }
@@ skipping 407 matching lines @@
   if (nack_module_)
     return nack_module_->TimeUntilNextProcess();
   return std::numeric_limits<int64_t>::max();
 }
 
 void VCMJitterBuffer::Process() {
   if (nack_module_)
     nack_module_->Process();
 }
 }  // namespace webrtc