kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8642 addtl patch

This commit is contained in:
Anthony Minessale 2015-12-14 16:05:51 -06:00
parent b1206d0b50
commit 8670e5f801
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,6 +649,7 @@ void conference_video_detach_video_layer(conference_member_t *member)
member->avatar_patched = 0;
conference_video_check_used_layers(canvas);
canvas->send_keyframe = 1;
member->managed_kps = 0;
if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
conference_member_update_status_field(member);
@ -876,7 +877,6 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t
void conference_video_reset_video_bitrate_counters(conference_member_t *member)
{
member->managed_kps = 0;
member->blackouts = 0;
member->good_img = 0;
member->blanks = 0;
@ -972,6 +972,7 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member,
switch_img_fill(canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &canvas->letterbox_bgcolor);
conference_video_reset_video_bitrate_counters(member);
member->managed_kps = 0;
if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
conference_member_update_status_field(member);

2
src/switch_channel.c
View File

@ -1858,7 +1858,7 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
switch_core_session_start_video_thread(channel->session);
}
if (flag == CF_VIDEO_DECODED_READ) {
if (flag == CF_VIDEO_DECODED_READ && channel->flags[CF_VIDEO]) {
switch_core_session_request_video_refresh(channel->session);
if (!switch_core_session_in_video_thread(channel->session)) {
switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);