Don't update the jitter estimate with frames containing retransmitted packets.

webrtc/modules/video_coding/frame_buffer2.cc

Index: webrtc/modules/video_coding/frame_buffer2.cc
diff --git a/webrtc/modules/video_coding/frame_buffer2.cc b/webrtc/modules/video_coding/frame_buffer2.cc
index 58c41bf1d087e50ecf36a9a3b819072f82ffa7c3..0831c0cd5fe920216c1bfb33771f2aa1d3d1fac0 100644
--- a/webrtc/modules/video_coding/frame_buffer2.cc
+++ b/webrtc/modules/video_coding/frame_buffer2.cc
@@ -118,18 +118,20 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
   rtc::CritScope lock(&crit_);
   if (next_frame_it != frames_.end()) {
     std::unique_ptr<FrameObject> frame = std::move(next_frame_it->second.frame);
-    int64_t received_time = frame->ReceivedTime();
-    uint32_t timestamp = frame->timestamp;
 
-    int64_t frame_delay;
-    if (inter_frame_delay_.CalculateDelay(timestamp, &frame_delay,
-                                          received_time)) {
-      jitter_estimator_->UpdateEstimate(frame_delay, frame->size());
+    if (!frame->delayed_by_retransmission()) {
+      int64_t frame_delay;
+
+      if (inter_frame_delay_.CalculateDelay(frame->timestamp, &frame_delay,
+                                            frame->ReceivedTime())) {
+        jitter_estimator_->UpdateEstimate(frame_delay, frame->size());
+      }
+
+      float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
+      timing_->SetJitterDelay(jitter_estimator_->GetJitterEstimate(rtt_mult));
+      timing_->UpdateCurrentDelay(frame->RenderTime(),
+                                  clock_->TimeInMilliseconds());
     }
-    float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
-    timing_->SetJitterDelay(jitter_estimator_->GetJitterEstimate(rtt_mult));
-    timing_->UpdateCurrentDelay(frame->RenderTime(),
-                                clock_->TimeInMilliseconds());
 
     UpdateJitterDelay();