提交 2f836a2c authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7744 amend

上级 987c84a1
...@@ -4949,6 +4949,9 @@ static void conference_write_video_frame(conference_obj_t *conference, conferenc ...@@ -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 ...@@ -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);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论