diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-06-16 18:54:30 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-06-16 18:54:30 +0000 |
| commit | 4c0265664ef7cf65a193486bd29b09ee80532f25 (patch) | |
| tree | 1dd57b8b026f8601093e89d231d739594d6b7288 /main/autoservice.c | |
| parent | 10ea4910e708eb912395b9fa137dbac2e7868950 (diff) | |
Merged revisions 200991 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r200991 | kpfleming | 2009-06-16 12:05:38 -0500 (Tue, 16 Jun 2009) | 11 lines
Improve support for media paths that can generate multiple frames at once.
There are various media paths in Asterisk (codec translators and UDPTL, primarily)
that can generate more than one frame to be generated when the application calling
them expects only a single frame. This patch addresses a number of those cases,
at least the primary ones to solve the known problems. In addition it removes the
broken TRACE_FRAMES support, fixes a number of bugs in various frame-related API
functions, and cleans up various code paths affected by these changes.
https://reviewboard.asterisk.org/r/175/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/autoservice.c')
| -rw-r--r-- | main/autoservice.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/main/autoservice.c b/main/autoservice.c index 26cb08582..7ed271016 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -163,15 +163,22 @@ static void *autoservice_run(void *ign) continue; } - if ((dup_f = ast_frdup(defer_frame))) { - AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list); + if (defer_frame != f) { + if ((dup_f = ast_frdup(defer_frame))) { + AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list); + } + } else { + if ((dup_f = ast_frisolate(defer_frame))) { + if (dup_f != defer_frame) { + ast_frfree(defer_frame); + } + AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list); + } } break; } - } - - if (f) { + } else if (f) { ast_frfree(f); } } |