diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 00:19:48 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 00:19:48 +0000 |
| commit | efd7bbd8293744b6049e03eae5d0c44304a1a744 (patch) | |
| tree | 4595d3fcdfe910a817965f5e4ae1add05ef25061 /main/rtp.c | |
| parent | 2575db2212e7d80f55f6804f83d63e9a1cf48798 (diff) | |
Add more frame types to forward in the RTP bridge loops.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@53050 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -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 4203974c5..fdf4ed68f 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2873,9 +2873,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); @@ -3082,12 +3087,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 */ |