From 7229c2ba48b498c9876d776865cb80b2037d984e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 1 Feb 2007 00:19:48 +0000 Subject: [PATCH] Add more frame types to forward in the RTP bridge loops. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53050 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/main/rtp.c b/main/rtp.c index 4203974c55..fdf4ed68ff 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 */