diff options
| author | niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-17 22:25:49 +0000 |
|---|---|---|
| committer | niklas.enbom@webrtc.org <niklas.enbom@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-17 22:25:49 +0000 |
| commit | db32ab0b04e5bd9cb7d92fc4a9ed72b1fcda62eb (patch) | |
| tree | 997a08f340df2650b6c75db6af0f7b623d495900 /voice_engine | |
| parent | d4914f3cedab22a0260cdedcb9dd5583355690ef (diff) | |
| download | webrtc-db32ab0b04e5bd9cb7d92fc4a9ed72b1fcda62eb.tar.gz | |
Make VoE handle longer delays
Review URL: https://webrtc-codereview.appspot.com/1047004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3385 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/channel.cc | 4 | ||||
| -rw-r--r-- | voice_engine/voice_engine_defines.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index 3548f4ae..38897fc0 100644 --- a/voice_engine/channel.cc +++ b/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/voice_engine/voice_engine_defines.h b/voice_engine/voice_engine_defines.h index 78bda787..a5f96a2e 100644 --- a/voice_engine/voice_engine_defines.h +++ b/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 |