kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-10270 add additional patch

Browse Source
This commit is contained in:
Anthony Minessale 2017-08-24 11:11:59 -05:00
parent 2ebdf42f2c
commit 7d6e60e251
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1089,13 +1089,12 @@ void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *l
{
switch_mutex_lock(layer->canvas->mutex);
switch_img_free(&layer->logo_img);
switch_mutex_lock(member->flag_mutex);
if (member->video_logo) {
switch_mutex_lock(member->flag_mutex);
switch_img_copy(member->video_logo, &layer->logo_img);
switch_mutex_unlock(member->flag_mutex);
if (layer->logo_img) {
layer->logo_pos = member->logo_pos;
@ -1103,6 +1102,8 @@ void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *l
}
}
switch_mutex_unlock(member->flag_mutex);
switch_mutex_unlock(layer->canvas->mutex);
}
@ -1118,9 +1119,10 @@ void conference_member_set_logo(conference_member_t *member, const char *path)
switch_mutex_lock(member->flag_mutex);
switch_img_free(&member->video_logo);
switch_mutex_unlock(member->flag_mutex);
if (!path || !strcasecmp(path, "clear")) {
switch_mutex_unlock(member->flag_mutex);
return;
}
@ -1185,6 +1187,8 @@ void conference_member_set_logo(conference_member_t *member, const char *path)
switch_safe_free(dup);
switch_mutex_unlock(member->flag_mutex);
return;
}