kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

FS-7744 amend

Browse Source
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

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

@ -4949,14 +4949,18 @@ 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))) {
switch_assert(vid_frame->packetlen <= SWITCH_RTP_MAX_BUF_LEN); if (vid_frame->img) {
tmp_frame = *vid_frame; switch_core_session_write_video_frame(imember->session, vid_frame, SWITCH_IO_FLAG_NONE, 0);
tmp_frame.packet = buf; } else {
tmp_frame.data = buf + 12; switch_assert(vid_frame->packetlen <= SWITCH_RTP_MAX_BUF_LEN);
memcpy(tmp_frame.packet, vid_frame->packet, vid_frame->packetlen); tmp_frame = *vid_frame;
tmp_frame.packetlen = vid_frame->packetlen; tmp_frame.packet = buf;
tmp_frame.datalen = vid_frame->datalen; tmp_frame.data = buf + 12;
switch_core_session_write_video_frame(imember->session, &tmp_frame, SWITCH_IO_FLAG_NONE, 0); memcpy(tmp_frame.packet, vid_frame->packet, vid_frame->packetlen);
tmp_frame.packetlen = vid_frame->packetlen;
tmp_frame.datalen = vid_frame->datalen;
switch_core_session_write_video_frame(imember->session, &tmp_frame, SWITCH_IO_FLAG_NONE, 0);
}
} }
} }