kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Anthony Minessale 2018-03-23 15:46:24 -05:00 committed by Muteesa Fred
parent 0e33e567e3
commit 443166dc2b
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1418,13 +1418,8 @@ switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, s
float sdiv = 0; float sdiv = 0;
int fdiv = 0; int fdiv = 0;
int force_w = 0, force_h = 0; int force_w = 0, force_h = 0;
conference_member_t *imember;
if (!conference_utils_test_flag(conference, CFLAG_MINIMIZE_VIDEO_ENCODING)) {
stream->write_function(stream, "-ERR Bandwidth control not available.\n");
return SWITCH_STATUS_SUCCESS;
}
if (!argv[2]) { if (!argv[2]) {
stream->write_function(stream, "-ERR Invalid input\n"); stream->write_function(stream, "-ERR Invalid input\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -1485,6 +1480,18 @@ switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, s
} }
switch_mutex_lock(conference->member_mutex); 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++) { for (i = 0; i <= conference->canvas_count; i++) {
if (i > -1 && i != id - 1) { if (i > -1 && i != id - 1) {
continue; continue;

10
src/mod/applications/mod_conference/conference_member.c
View File

@ -806,6 +806,8 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
conference_video_reset_member_codec_index(member); conference_video_reset_member_codec_index(member);
if (has_video) { if (has_video) {
int bitrate = conference->video_codec_settings.video.bandwidth;
if ((var = switch_channel_get_variable_dup(member->channel, "video_mute_png", SWITCH_FALSE, -1))) { if ((var = switch_channel_get_variable_dup(member->channel, "video_mute_png", SWITCH_FALSE, -1))) {
member->video_mute_png = switch_core_strdup(member->pool, var); member->video_mute_png = switch_core_strdup(member->pool, var);
member->video_mute_img = switch_img_read_png(member->video_mute_png, SWITCH_IMG_FMT_I420); member->video_mute_img = switch_img_read_png(member->video_mute_png, SWITCH_IMG_FMT_I420);
@ -832,11 +834,17 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
if (member->max_bw_out < conference->video_codec_settings.video.bandwidth) { if (member->max_bw_out < conference->video_codec_settings.video.bandwidth) {
conference_utils_member_set_flag_locked(member, MFLAG_NO_MINIMIZE_ENCODING); conference_utils_member_set_flag_locked(member, MFLAG_NO_MINIMIZE_ENCODING);
switch_core_media_set_outgoing_bitrate(member->session, SWITCH_MEDIA_TYPE_VIDEO, member->max_bw_out); bitrate = member->max_bw_out;
} }
} }
if (bitrate) {
switch_core_media_set_outgoing_bitrate(member->session, SWITCH_MEDIA_TYPE_VIDEO, bitrate);
}
} }
switch_channel_set_variable_printf(channel, "conference_member_id", "%d", member->id); switch_channel_set_variable_printf(channel, "conference_member_id", "%d", member->id);
switch_channel_set_variable_printf(channel, "conference_moderator", "%s", conference_utils_member_test_flag(member, MFLAG_MOD) ? "true" : "false"); switch_channel_set_variable_printf(channel, "conference_moderator", "%s", conference_utils_member_test_flag(member, MFLAG_MOD) ? "true" : "false");
switch_channel_set_variable_printf(channel, "conference_ghost", "%s", conference_utils_member_test_flag(member, MFLAG_GHOST) ? "true" : "false"); switch_channel_set_variable_printf(channel, "conference_ghost", "%s", conference_utils_member_test_flag(member, MFLAG_GHOST) ? "true" : "false");

8
src/mod/applications/mod_conference/conference_video.c
View File

@ -3783,8 +3783,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
} }
if (layer && use_img) { if (layer && use_img) {
switch_img_copy(use_img, &layer->cur_img); //switch_img_copy(use_img, &layer->cur_img);
conference_video_scale_and_patch(layer, NULL, SWITCH_FALSE); conference_video_scale_and_patch(layer, use_img, SWITCH_FALSE);
} }
} }
@ -3806,8 +3806,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
switch_img_free(&layer->banner_img); switch_img_free(&layer->banner_img);
switch_img_free(&layer->logo_img); switch_img_free(&layer->logo_img);
layer->member_id = -1; layer->member_id = -1;
switch_img_copy(img, &layer->cur_img); //switch_img_copy(img, &layer->cur_img);
conference_video_scale_and_patch(layer, NULL, SWITCH_FALSE); conference_video_scale_and_patch(layer, img, SWITCH_FALSE);
} }
} }