diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-11-20 19:52:38 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-11-20 19:52:38 +0000 |
| commit | dcba38ebaf66e900ae9b435ccef0a62cf4374a36 (patch) | |
| tree | 4a5adec8521f9968df66b72b5ceb9b72deeaee5c | |
| parent | 33c964ef1a8637a4dc67751aa9c73d314a205eb8 (diff) | |
Merged revisions 47860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47860 | file | 2006-11-20 14:51:36 -0500 (Mon, 20 Nov 2006) | 10 lines
Merged revisions 47859 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47859 | file | 2006-11-20 14:50:21 -0500 (Mon, 20 Nov 2006) | 2 lines
Don't forget to byte swap if we are exiting the smoother feed early. (issue #8287 reported by arturs)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/frame.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/frame.c b/main/frame.c index 73f2e3d15..681f36892 100644 --- a/main/frame.c +++ b/main/frame.c @@ -188,6 +188,8 @@ int __ast_smoother_feed(struct ast_smoother *s, struct ast_frame *f, int swap) /* Optimize by sending the frame we just got on the next read, thus eliminating the douple copy */ + if (swap) + ast_swapcopy_samples(f->data, f->data, f->samples); s->opt = f; return 0; } else { @@ -198,6 +200,8 @@ int __ast_smoother_feed(struct ast_smoother *s, struct ast_frame *f, int swap) we were unable to optimize because there was still some cruft left over. Lets just drop the cruft so we can move to a fully optimized path */ + if (swap) + ast_swapcopy_samples(f->data, f->data, f->samples); s->len = 0; s->opt = f; return 0; |