From 218c542c0bf1375306d48e81ad4bf3e69a058731 Mon Sep 17 00:00:00 2001 From: "niklas.enbom@webrtc.org" Date: Thu, 17 Jan 2013 22:25:49 +0000 Subject: [PATCH] Make VoE handle longer delays Review URL: https://webrtc-codereview.appspot.com/1047004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3385 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/channel.cc | 4 ++-- webrtc/voice_engine/voice_engine_defines.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 3548f4aef6..38897fc0da 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -6522,14 +6522,14 @@ Channel::UpdatePacketDelay(const WebRtc_UWord32 timestamp, timeStampDiffMs = 0; return -1; } - if (timeStampDiffMs > 5000) + if (timeStampDiffMs > (2 * kVoiceEngineMaxMinPlayoutDelayMs)) { timeStampDiffMs = 0; } if (_averageDelayMs == 0) { - _averageDelayMs = timeStampDiffMs; + _averageDelayMs = timeStampDiffMs * 10; } else { diff --git a/webrtc/voice_engine/voice_engine_defines.h b/webrtc/voice_engine/voice_engine_defines.h index 78bda78799..a5f96a2e80 100644 --- a/webrtc/voice_engine/voice_engine_defines.h +++ b/webrtc/voice_engine/voice_engine_defines.h @@ -106,7 +106,7 @@ enum { kVoiceEngineMaxIsacMaxPayloadSizeBytesSwb = 600 }; // Lowest minimum playout delay enum { kVoiceEngineMinMinPlayoutDelayMs = 0 }; // Highest minimum playout delay -enum { kVoiceEngineMaxMinPlayoutDelayMs = 1000 }; +enum { kVoiceEngineMaxMinPlayoutDelayMs = 10000 }; // Network // Min packet-timeout time for received RTP packets