diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 19:20:51 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-25 19:20:51 +0000 |
| commit | 0389dc274d22a89052e22868ebec9c565fbd525c (patch) | |
| tree | 30d483c294a14d7f403cc03b007509e739531cf1 /main/jitterbuf.c | |
| parent | d3671cfb6af56242638804f6e70c825b0af05bc3 (diff) | |
Merged revisions 52265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r52265 | file | 2007-01-25 14:18:33 -0500 (Thu, 25 Jan 2007) | 10 lines
Merged revisions 52264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r52264 | file | 2007-01-25 14:15:29 -0500 (Thu, 25 Jan 2007) | 2 lines
Allow dequeueing of frames with negative timestamp by moving jitterbuffer frames check to jb_next. (issue #8546 reported by harmen)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@52266 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/jitterbuf.c')
| -rw-r--r-- | main/jitterbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/jitterbuf.c b/main/jitterbuf.c index 5f32529f2..189be3451 100644 --- a/main/jitterbuf.c +++ b/main/jitterbuf.c @@ -756,8 +756,8 @@ static enum jb_return_code _jb_get(jitterbuf *jb, jb_frame *frameout, long now, long jb_next(jitterbuf *jb) { if (jb->info.silence_begin_ts) { - long next = queue_next(jb); - if (next > 0) { + if (jb->frames) { + long next = queue_next(jb); history_get(jb); /* shrink during silence */ if (jb->info.target - jb->info.current < -jb->info.conf.target_extra) |