sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "bridge_softmix: Fix sporadic incorrect video stream mapping."

This commit is contained in:
Jenkins2 2018-04-30 12:35:10 -05:00 committed by Gerrit Code Review
parent 3bad41257b de9c0ede4a
commit f633af89c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridges/bridge_softmix.c
View File

@ -2197,12 +2197,13 @@ static void softmix_bridge_stream_topology_changed(struct ast_bridge *bridge, st
AST_VECTOR_SIZE(&media_types) - 1, &bridge->channels);
ast_bridge_channel_lock(participant);
ast_channel_lock(participant->chan);
} else if (is_video_dest(stream, NULL, NULL)) {
/* We expect to never read media from video destination channels, but just
* in case, we should set their to_bridge value to -1.
} else if (ast_stream_get_type(stream) == AST_MEDIA_TYPE_VIDEO) {
/* Video stream mapping occurs directly when a video source stream
* is found on a channel. Video streams should otherwise remain
* unmapped.
*/
AST_VECTOR_REPLACE(&participant->stream_map.to_bridge, i, -1);
} else {
} else if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {
/* XXX This is copied from ast_stream_topology_map(). This likely could
* be factored out in some way
*/