diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 18:07:39 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 18:07:39 +0000 |
| commit | 8936c3b20d56d2c3fa392ff82f9729114906cf92 (patch) | |
| tree | d07a86713078f3c289a29f61e5eff089f9e27a3c /main | |
| parent | 7531df49c26e62303f5a65f150fe1cb8d41c34f6 (diff) | |
Merged revisions 297310 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r297310 | twilson | 2010-12-02 12:00:27 -0600 (Thu, 02 Dec 2010) | 12 lines
Initialize offset for adaptive jitter buffer
When the adaptive jitter buffer is enabled in sip.conf, the first frame placed
in the jitter buffer fails with something like:
jb_warning_output: Resyncing the jb. last_delay 0, this delay -215886466,
threshold 1000, new offset 215886466
This happens because the offset is not initialized before calling jb_put(). This
patch modifies jb_put_first_adaptive() to set the offset to the frame's
timestamp.
Review: https://reviewboard.asterisk.org/r/1041/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@297311 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/abstract_jb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index eb42346af..6b86ba7ae 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -763,6 +763,11 @@ static void jb_destroy_adaptive(void *jb) static int jb_put_first_adaptive(void *jb, struct ast_frame *fin, long now) { + jitterbuf *adaptivejb = (jitterbuf *) jb; + + /* Initialize the offset to that of the first frame's timestamp */ + adaptivejb->info.resync_offset = fin->ts; + return jb_put_adaptive(jb, fin, now); } |