提交 81d81b54 authored 作者: Seven Du's avatar Seven Du 提交者: Andrey Volk

FS-11293 #resolve attach to the original canvas when coming back from vmuted

上级 d793f2f2
......@@ -2640,7 +2640,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
if (conference_utils_test_flag(conference, CFLAG_VIDEO_MUTE_EXIT_CANVAS) &&
!conference_utils_member_test_flag(member, MFLAG_CAN_BE_SEEN)) {
return SWITCH_STATUS_FALSE;
return SWITCH_STATUS_NOOP;
}
if (conference_utils_member_test_flag(member, MFLAG_HOLD)) {
......@@ -3539,8 +3539,11 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
}
if (!layer && (!conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || ((switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_INACTIVE)))) {
if (conference_video_find_layer(conference, canvas, imember, &layer) == SWITCH_STATUS_SUCCESS) {
switch_status_t ret = conference_video_find_layer(conference, canvas, imember, &layer);
if ( ret == SWITCH_STATUS_SUCCESS) {
imember->layer_timeout = 0;
} else if (ret == SWITCH_STATUS_NOOP) {
} else {
if (--imember->layer_timeout <= 0) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论