kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-11057: [mod_conference] CPU race on personal canvas #resolve

Browse Source
This commit is contained in:
Anthony Minessale
2018-03-23 15:46:24 -05:00
committed by Muteesa Fred
parent 2a82d401a6
commit d3aee10e28
3 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mod/applications/mod_conference/conference_api.c
View File

@@ -1486,13 +1486,8 @@ switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, s
float sdiv = 0;
int fdiv = 0;
int force_w = 0, force_h = 0;
if (!conference_utils_test_flag(conference, CFLAG_MINIMIZE_VIDEO_ENCODING)) {
stream->write_function(stream, "-ERR Bandwidth control not available.\n");
return SWITCH_STATUS_SUCCESS;
}
conference_member_t *imember;
if (!argv[2]) {
stream->write_function(stream, "-ERR Invalid input\n");
return SWITCH_STATUS_SUCCESS;
@@ -1553,6 +1548,18 @@ switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, s
}
switch_mutex_lock(conference->member_mutex);
for (imember = conference->members; imember; imember = imember->next) {
if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
continue;
}
switch_core_media_set_outgoing_bitrate(imember->session, SWITCH_MEDIA_TYPE_VIDEO, video_write_bandwidth);
stream->write_function(stream, "+OK Set Bandwidth %d kps for member %s\n", video_write_bandwidth, switch_channel_get_name(imember->channel));
}
for (i = 0; i <= conference->canvas_count; i++) {
if (i > -1 && i != id - 1) {
continue;