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

bridge_channel: Don't queue unmapped frames.

Browse Source 
If a frame is written to a channel in a bridge we
would normally queue this frame up and the channel
thread would then act upon it. If this frame had no
stream mapping on the channel it would then be
discarded.

This change adds a check before the queueing occurs
to determine if a mapping exists. If it does not
exist then the frame is not even queued at all. This
stops a frame duplication from happening and from
the channel thread having to wake up and deal with
it.

Change-Id: I17189b9b1dec45fc7e4490e8081d444a25a00bda
This commit is contained in:
Joshua C. Colp
2020-06-05 06:45:18 -03:00
committed by Joshua Colp
parent d2500c6273
commit 1fcb6b1b21
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/bridge_channel.c
View File

@@ -1043,6 +1043,23 @@ int ast_bridge_channel_queue_frame(struct ast_bridge_channel *bridge_channel, st
return 0;
}
if ((fr->frametype == AST_FRAME_VOICE || fr->frametype == AST_FRAME_VIDEO ||
fr->frametype == AST_FRAME_TEXT || fr->frametype == AST_FRAME_IMAGE ||
fr->frametype == AST_FRAME_RTCP) && fr->stream_num > -1) {
int num = -1;
ast_bridge_channel_lock(bridge_channel);
if (fr->stream_num < (int)AST_VECTOR_SIZE(&bridge_channel->stream_map.to_channel)) {
num = AST_VECTOR_GET(&bridge_channel->stream_map.to_channel, fr->stream_num);
}
ast_bridge_channel_unlock(bridge_channel);
if (num == -1) {
/* We don't have a mapped stream so just discard this frame. */
return 0;
}
}
dup = ast_frdup(fr);
if (!dup) {
return -1;