From eabcee45c57ca8ceacb72b3b8b2ba5976b90b3d6 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Tue, 11 Apr 2006 11:39:32 +0000 Subject: [PATCH] reenabled resynchronizing if TS out of range (in the case of clock skew or re-Invite) git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@19 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmRtpStream.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/AmRtpStream.cpp b/core/AmRtpStream.cpp index 68c95a04..a68f1ce5 100644 --- a/core/AmRtpStream.cpp +++ b/core/AmRtpStream.cpp @@ -260,14 +260,14 @@ int AmRtpStream::receive( unsigned char* buffer, unsigned int size, ts = rp.timestamp - recv_offset + jitter_delay; // resync -// if( ts_less()(ts, audio_buffer_ts) || -// !ts_less()(ts, audio_buffer_ts + max_delay) ){ - -// DBG("resync needed: reference ts = %u; write ts = %u\n", -// audio_buffer_ts,ts); -// recv_offset = rp.timestamp - audio_buffer_ts; -// ts = audio_buffer_ts + jitter_delay; -// } + if( ts_less()(ts, audio_buffer_ts) || + !ts_less()(ts, audio_buffer_ts + max_delay) ){ + + DBG("resync needed: reference ts = %u; write ts = %u\n", + audio_buffer_ts,ts); + recv_offset = rp.timestamp - audio_buffer_ts; + ts = audio_buffer_ts + jitter_delay; + } } assert(rp.getData());