提交 7d6e60e2 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-10270 add additional patch

上级 2ebdf42f
...@@ -1089,13 +1089,12 @@ void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *l ...@@ -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_mutex_lock(layer->canvas->mutex);
switch_img_free(&layer->logo_img); switch_img_free(&layer->logo_img);
switch_mutex_lock(member->flag_mutex);
if (member->video_logo) { if (member->video_logo) {
switch_mutex_lock(member->flag_mutex);
switch_img_copy(member->video_logo, &layer->logo_img); switch_img_copy(member->video_logo, &layer->logo_img);
switch_mutex_unlock(member->flag_mutex);
if (layer->logo_img) { if (layer->logo_img) {
layer->logo_pos = member->logo_pos; layer->logo_pos = member->logo_pos;
...@@ -1103,6 +1102,8 @@ void conference_video_layer_set_logo(conference_member_t *member, mcu_layer_t *l ...@@ -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); switch_mutex_unlock(layer->canvas->mutex);
} }
...@@ -1118,9 +1119,10 @@ void conference_member_set_logo(conference_member_t *member, const char *path) ...@@ -1118,9 +1119,10 @@ void conference_member_set_logo(conference_member_t *member, const char *path)
switch_mutex_lock(member->flag_mutex); switch_mutex_lock(member->flag_mutex);
switch_img_free(&member->video_logo); switch_img_free(&member->video_logo);
switch_mutex_unlock(member->flag_mutex);
if (!path || !strcasecmp(path, "clear")) { if (!path || !strcasecmp(path, "clear")) {
switch_mutex_unlock(member->flag_mutex);
return; return;
} }
...@@ -1185,6 +1187,8 @@ void conference_member_set_logo(conference_member_t *member, const char *path) ...@@ -1185,6 +1187,8 @@ void conference_member_set_logo(conference_member_t *member, const char *path)
switch_safe_free(dup); switch_safe_free(dup);
switch_mutex_unlock(member->flag_mutex);
return; return;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论