VCM: Setting buffering delay in timing
Review URL: https://webrtc-codereview.appspot.com/1338004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3921 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/video_coding/main/source/receiver.cc b/webrtc/modules/video_coding/main/source/receiver.cc
index ae0f1ce..c77936c 100644
--- a/webrtc/modules/video_coding/main/source/receiver.cc
+++ b/webrtc/modules/video_coding/main/source/receiver.cc
@@ -430,11 +430,11 @@
if (desired_delay_ms < 0 || desired_delay_ms > kMaxReceiverDelayMs) {
return -1;
}
- jitter_buffer_.SetMaxJitterEstimate(desired_delay_ms);
+ // Enable a max filter on the jitter estimate for non-zero delays.
+ jitter_buffer_.SetMaxJitterEstimate(desired_delay_ms > 0);
max_video_delay_ms_ = desired_delay_ms + kMaxVideoDelayMs;
- timing_->SetMaxVideoDelay(max_video_delay_ms_);
// Initializing timing to the desired delay.
- timing_->SetRequiredDelay(desired_delay_ms);
+ timing_->SetMinimumTotalDelay(desired_delay_ms);
return 0;
}