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

FS-7744 amend

This commit is contained in:
Anthony Minessale 2015-07-02 16:12:28 -05:00
parent 987c84a119
commit 2f836a2c53
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_conference/mod_conference.c
View File

@ -4949,6 +4949,9 @@ static void conference_write_video_frame(conference_obj_t *conference, conferenc
(switch_test_flag(conference, CFLAG_VID_FLOOR_LOCK) || (switch_test_flag(conference, CFLAG_VID_FLOOR_LOCK) ||
!(imember->id == imember->conference->video_floor_holder && imember->conference->last_video_floor_holder))) { !(imember->id == imember->conference->video_floor_holder && imember->conference->last_video_floor_holder))) {
if (vid_frame->img) {
switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
} else {
switch_assert(vid_frame->packetlen <= SWITCH_RTP_MAX_BUF_LEN); switch_assert(vid_frame->packetlen <= SWITCH_RTP_MAX_BUF_LEN);
tmp_frame = *vid_frame; tmp_frame = *vid_frame;
tmp_frame.packet = buf; tmp_frame.packet = buf;
@ -4959,6 +4962,7 @@ static void conference_write_video_frame(conference_obj_t *conference, conferenc
switch_core_session_write_video_frame(imember->session, &tmp_frame, SWITCH_IO_FLAG_NONE, 0); switch_core_session_write_video_frame(imember->session, &tmp_frame, SWITCH_IO_FLAG_NONE, 0);
} }
} }
}
switch_core_session_rwunlock(isession); switch_core_session_rwunlock(isession);
} }