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

webrtc/video/video_stream_decoder.cc

Index: webrtc/video/video_stream_decoder.cc
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc
index 0cb0b9d474fe859ec239194f85c69af6d673c8ed..5aab7b246c7dab15caf1fdb7c531dadaffa62778 100644
--- a/webrtc/video/video_stream_decoder.cc
+++ b/webrtc/video/video_stream_decoder.cc
@@ -54,8 +54,14 @@ VideoStreamDecoder::VideoStreamDecoder(
   static const int kDefaultRenderDelayMs = 10;
   video_receiver_->SetRenderDelay(kDefaultRenderDelayMs);
 
-  VCMVideoProtection video_protection = enable_nack ? kProtectionNack
-                                                    : kProtectionNone;
+  VCMVideoProtection video_protection = kProtectionNone;
+  if (enable_nack) {
+    if (enable_fec)
+      video_protection = kProtectionNackFEC;
+    else
+      video_protection = kProtectionNack;
+  }
+
   VCMDecodeErrorMode decode_error_mode = enable_nack ? kNoErrors : kWithErrors;
   video_receiver_->SetVideoProtection(video_protection, true);
   video_receiver_->SetDecodeErrorMode(decode_error_mode);