kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undoing framehook support. Issues were uncovered by Bamboo.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413667 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-05-11 01:07:44 +00:00
parent 47fc94f095
commit 1ccc4e5b70
6 changed files with 94 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bridges/bridge_native_rtp.c
View File

@@ -288,12 +288,6 @@ static struct ast_frame *native_rtp_framehook(struct ast_channel *chan, struct a
return f;
}
/*! \brief Callback function which informs upstream if we are consuming a frame of a specific type */
static int native_rtp_framehook_consume(void *data, enum ast_frame_type type)
{
return (type == AST_FRAME_CONTROL ? 1 : 0);
}
/*! \brief Internal helper function which checks whether the channels are compatible with our native bridging */
static int native_rtp_bridge_capable(struct ast_channel *chan)
{
@@ -398,7 +392,6 @@ static int native_rtp_bridge_framehook_attach(struct ast_bridge_channel *bridge_
static struct ast_framehook_interface hook = {
.version = AST_FRAMEHOOK_INTERFACE_VERSION,
.event_cb = native_rtp_framehook,
.consume_cb = native_rtp_framehook_consume,
};
if (!data) {