diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-02-01 00:23:19 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-02-01 00:23:19 +0000 |
| commit | fa66a0bf039c175af505103e81ca2ee24a89f09e (patch) | |
| tree | e6fc38d9244352deda130b8430b9cd3dc5d01373 | |
| parent | b23389219855875161ca52097fae81f404e8a14f (diff) | |
Merged revisions 53050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53050 | file | 2007-01-31 18:19:48 -0600 (Wed, 31 Jan 2007) | 2 lines
Add more frame types to forward in the RTP bridge loops.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/rtp.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/main/rtp.c b/main/rtp.c index c48fe2caf..d0738e3a3 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2961,9 +2961,14 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct return AST_BRIDGE_COMPLETE; } } else { - if ((fr->frametype == AST_FRAME_DTMF) || + if ((fr->frametype == AST_FRAME_DTMF_BEGIN) || + (fr->frametype == AST_FRAME_DTMF) || (fr->frametype == AST_FRAME_VOICE) || - (fr->frametype == AST_FRAME_VIDEO)) { + (fr->frametype == AST_FRAME_VIDEO) || + (fr->frametype == AST_FRAME_IMAGE) || + (fr->frametype == AST_FRAME_HTML) || + (fr->frametype == AST_FRAME_MODEM) || + (fr->frametype == AST_FRAME_TEXT)) { ast_write(other, fr); } ast_frfree(fr); @@ -3176,12 +3181,17 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast break; } } else { - /* If this is a DTMF, voice, or video frame write it to the other channel */ - if ((fr->frametype == AST_FRAME_DTMF) || + if ((fr->frametype == AST_FRAME_DTMF_BEGIN) || + (fr->frametype == AST_FRAME_DTMF) || (fr->frametype == AST_FRAME_VOICE) || - (fr->frametype == AST_FRAME_VIDEO)) { + (fr->frametype == AST_FRAME_VIDEO) || + (fr->frametype == AST_FRAME_IMAGE) || + (fr->frametype == AST_FRAME_HTML) || + (fr->frametype == AST_FRAME_MODEM) || + (fr->frametype == AST_FRAME_TEXT)) { ast_write(other, fr); } + ast_frfree(fr); } /* Swap priority */ |