提交 3b7d07d0 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Michael Jerris

FS-7513: don't patch image on mute

上级 63889262
...@@ -1028,9 +1028,10 @@ static void reset_layer(mcu_canvas_t *canvas, mcu_layer_t *layer) ...@@ -1028,9 +1028,10 @@ static void reset_layer(mcu_canvas_t *canvas, mcu_layer_t *layer)
switch_img_free(&layer->logo_img); switch_img_free(&layer->logo_img);
switch_img_free(&layer->logo_text_img); switch_img_free(&layer->logo_text_img);
layer->mute_patched = 0;
layer->banner_patched = 0; layer->banner_patched = 0;
layer->is_avatar = 0; layer->is_avatar = 0;
if (layer->geometry.overlap) { if (layer->geometry.overlap) {
canvas->refresh = 1; canvas->refresh = 1;
} }
...@@ -2186,7 +2187,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -2186,7 +2187,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
for (i = 0; i < conference->canvas->total_layers; i++) { for (i = 0; i < conference->canvas->total_layers; i++) {
mcu_layer_t *layer = &conference->canvas->layers[i]; mcu_layer_t *layer = &conference->canvas->layers[i];
if ((layer->member_id > -1 || layer->fnode) && layer->cur_img && (layer->tagged || layer->geometry.overlap)) { if (!layer->mute_patched && (layer->member_id > -1 || layer->fnode) && layer->cur_img && (layer->tagged || layer->geometry.overlap)) {
if (conference->canvas->refresh) { if (conference->canvas->refresh) {
layer->refresh = 1; layer->refresh = 1;
conference->canvas->refresh++; conference->canvas->refresh++;
...@@ -2195,6 +2196,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -2195,6 +2196,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
if (layer->cur_img) { if (layer->cur_img) {
scale_and_patch(conference, layer, NULL, SWITCH_FALSE); scale_and_patch(conference, layer, NULL, SWITCH_FALSE);
} }
layer->tagged = 0; layer->tagged = 0;
} }
layer->bugged = 0; layer->bugged = 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论