kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_softmix: Don't reorder streams on participant leaving."

Browse Source
This commit is contained in:
Jenkins2
2017-07-18 08:13:15 -05:00
committed by Gerrit Code Review
parent 594c7a50af bcd3f65174
commit fb3c7926b7
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bridges/bridge_softmix.c
View File

@@ -701,14 +701,15 @@ static int remove_destination_streams(struct ast_stream_topology *dest,
stream = ast_stream_topology_get_stream(source, i);
if (is_video_dest(stream, channel_name, NULL)) {
continue;
}
stream_clone = ast_stream_clone(stream, NULL);
if (!stream_clone) {
continue;
}
if (is_video_dest(stream, channel_name, NULL)) {
ast_stream_set_state(stream_clone, AST_STREAM_STATE_REMOVED);
}
if (ast_stream_topology_append_stream(dest, stream_clone) < 0) {
ast_stream_free(stream_clone);
}
@@ -1964,9 +1965,9 @@ AST_TEST_DEFINE(sfu_remove_destination_streams)
int num_streams;
int params_index[4];
} removal_results[] = {
{ "PJSIP/Bob-00000001", 3, { 0, 1, 3, -1 }, },
{ "PJSIP/Bob-00000001", 4, { 0, 1, 2, 3 }, },
{ "PJSIP/Edward-00000004", 4, { 0, 1, 2, 3 }, },
{ "", 2, { 0, 1, -1, -1 }, },
{ "", 4, { 0, 1, 2, 3 }, },
};
struct ast_stream_topology *orig = NULL;
struct ast_stream_topology *result = NULL;
@@ -2033,6 +2034,12 @@ AST_TEST_DEFINE(sfu_remove_destination_streams)
ast_format_cap_get_names(ast_stream_get_formats(actual), &actual_str));
goto end;
}
if (is_video_dest(actual, removal_results[i].channel_name, NULL) &&
ast_stream_get_state(actual) != AST_STREAM_STATE_REMOVED) {
ast_test_status_update(test, "Removed stream %s does not have a state of removed\n", ast_stream_get_name(actual));
goto end;
}
}
}