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

Merge "bridge_native_rtp.c: Fixup native_rtp_framehook()" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-08-30 08:38:49 -05:00
committed by Gerrit Code Review
parent d2ace23248 4aaccb7795
commit 844f70f301
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bridges/bridge_native_rtp.c
View File

@@ -541,10 +541,12 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
static struct ast_frame *native_rtp_framehook(struct ast_channel *chan, static struct ast_frame *native_rtp_framehook(struct ast_channel *chan,
struct ast_frame *f, enum ast_framehook_event event, void *data) struct ast_frame *f, enum ast_framehook_event event, void *data)
{ {
RAII_VAR(struct ast_bridge *, bridge, NULL, ao2_cleanup); struct ast_bridge *bridge;
struct native_rtp_framehook_data *native_data = data; struct native_rtp_framehook_data *native_data = data;
if (!f || (event != AST_FRAMEHOOK_EVENT_WRITE)) { if (!f
|| f->frametype != AST_FRAME_CONTROL
|| event != AST_FRAMEHOOK_EVENT_WRITE) {
return f; return f;
} }
@@ -563,14 +565,20 @@ static struct ast_frame *native_rtp_framehook(struct ast_channel *chan,
ast_channel_unlock(chan); ast_channel_unlock(chan);
ast_bridge_lock(bridge); ast_bridge_lock(bridge);
if (!native_data->detached) { if (!native_data->detached) {
if (f->subclass.integer == AST_CONTROL_HOLD) { switch (f->subclass.integer) {
case AST_CONTROL_HOLD:
native_rtp_bridge_stop(bridge, chan); native_rtp_bridge_stop(bridge, chan);
} else if ((f->subclass.integer == AST_CONTROL_UNHOLD) || break;
(f->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) { case AST_CONTROL_UNHOLD:
case AST_CONTROL_UPDATE_RTP_PEER:
native_rtp_bridge_start(bridge, chan); native_rtp_bridge_start(bridge, chan);
break;
default:
break;
} }
} }
ast_bridge_unlock(bridge); ast_bridge_unlock(bridge);
ao2_ref(bridge, -1);
ast_channel_lock(chan); ast_channel_lock(chan);
} }