提交 8e37e9b4 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7513 flush video on video mute/unmute

上级 8e925946
...@@ -2062,6 +2062,8 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -2062,6 +2062,8 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
int flushed = flush_video_queue(imember->video_queue); int flushed = flush_video_queue(imember->video_queue);
if (flushed && imember->auto_avatar) { if (flushed && imember->auto_avatar) {
switch_channel_video_sync(imember->channel);
switch_img_free(&imember->avatar_png_img); switch_img_free(&imember->avatar_png_img);
imember->avatar_patched = 0; imember->avatar_patched = 0;
reset_video_bitrate_counters(imember); reset_video_bitrate_counters(imember);
...@@ -2072,7 +2074,6 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -2072,7 +2074,6 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
} }
imember->blanks = 0; imember->blanks = 0;
//switch_channel_video_sync(imember->channel);
} else { } else {
} }
...@@ -8414,11 +8415,11 @@ static switch_status_t conf_api_sub_vmute(conference_member_t *member, switch_st ...@@ -8414,11 +8415,11 @@ static switch_status_t conf_api_sub_vmute(conference_member_t *member, switch_st
switch_clear_flag_locked(member, MFLAG_CAN_BE_SEEN); switch_clear_flag_locked(member, MFLAG_CAN_BE_SEEN);
reset_video_bitrate_counters(member); reset_video_bitrate_counters(member);
//if (member->channel) { if (member->channel) {
//switch_channel_set_flag(member->channel, CF_VIDEO_PAUSE_READ); switch_channel_set_flag(member->channel, CF_VIDEO_PAUSE_READ);
//switch_core_session_request_video_refresh(member->session); switch_core_session_request_video_refresh(member->session);
//switch_channel_video_sync(member->channel); switch_channel_video_sync(member->channel);
//} }
if (!(data) || !strstr((char *) data, "quiet")) { if (!(data) || !strstr((char *) data, "quiet")) {
switch_set_flag(member, MFLAG_INDICATE_MUTE); switch_set_flag(member, MFLAG_INDICATE_MUTE);
...@@ -8474,8 +8475,8 @@ static switch_status_t conf_api_sub_unvmute(conference_member_t *member, switch_ ...@@ -8474,8 +8475,8 @@ static switch_status_t conf_api_sub_unvmute(conference_member_t *member, switch_
reset_video_bitrate_counters(member); reset_video_bitrate_counters(member);
if (member->channel) { if (member->channel) {
//switch_channel_clear_flag(member->channel, CF_VIDEO_PAUSE_READ); switch_channel_clear_flag(member->channel, CF_VIDEO_PAUSE_READ);
//switch_channel_video_sync(member->channel); switch_channel_video_sync(member->channel);
} }
if (!(data) || !strstr((char *) data, "quiet")) { if (!(data) || !strstr((char *) data, "quiet")) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论