kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_softmix.c: Change remove_destination_streams() return meaning."

Browse Source
This commit is contained in:
Jenkins2
2017-12-19 10:37:53 -06:00
committed by Gerrit Code Review
parent 758b321f4c 4c04e13783
commit ece673f0f6
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bridges/bridge_softmix.c
View File

@@ -698,10 +698,11 @@ static int softmix_bridge_join(struct ast_bridge *bridge, struct ast_bridge_chan
return 0; return 0;
} }
static void remove_destination_streams(struct ast_stream_topology *topology, static int remove_destination_streams(struct ast_stream_topology *topology,
const char *channel_name) const char *channel_name)
{ {
int i; int i;
int stream_removed = 0;
for (i = 0; i < ast_stream_topology_get_count(topology); ++i) { for (i = 0; i < ast_stream_topology_get_count(topology); ++i) {
struct ast_stream *stream; struct ast_stream *stream;
@@ -710,8 +711,10 @@ static void remove_destination_streams(struct ast_stream_topology *topology,
if (is_video_dest(stream, channel_name, NULL)) { if (is_video_dest(stream, channel_name, NULL)) {
ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED); ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
stream_removed = 1;
} }
} }
return stream_removed;
} }
static int sfu_topologies_on_leave(struct ast_bridge_channel *leaver, struct ast_bridge_channels_list *participants) static int sfu_topologies_on_leave(struct ast_bridge_channel *leaver, struct ast_bridge_channels_list *participants)
@@ -721,13 +724,16 @@ static int sfu_topologies_on_leave(struct ast_bridge_channel *leaver, struct ast
AST_LIST_TRAVERSE(participants, participant, entry) { AST_LIST_TRAVERSE(participants, participant, entry) {
sc = participant->tech_pvt; sc = participant->tech_pvt;
remove_destination_streams(sc->topology, ast_channel_name(leaver->chan)); if (!remove_destination_streams(sc->topology, ast_channel_name(leaver->chan))) {
continue;
}
ast_channel_request_stream_topology_change(participant->chan, sc->topology, NULL); ast_channel_request_stream_topology_change(participant->chan, sc->topology, NULL);
} }
sc = leaver->tech_pvt; sc = leaver->tech_pvt;
remove_destination_streams(sc->topology, ""); if (remove_destination_streams(sc->topology, "")) {
ast_channel_request_stream_topology_change(leaver->chan, sc->topology, NULL); ast_channel_request_stream_topology_change(leaver->chan, sc->topology, NULL);
}
return 0; return 0;
} }