mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-21 20:56:39 +00:00
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
This commit is contained in:
20
main/rtp.c
20
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 */
|
||||
|
Reference in New Issue
Block a user