FS-7744 amend

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index eb2b4a51586a4a31ecafd986c61b2bab5c55c1f1..b7a88236597ffdcc43dcf1ddecfa712e3d576a43 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -4949,14 +4949,18 @@ static void conference_write_video_frame(conference_obj_t *conference, conferenc
                                (switch_test_flag(conference, CFLAG_VID_FLOOR_LOCK) ||
                                 !(imember->id == imember->conference->video_floor_holder && imember->conference->last_video_floor_holder))) {
 
-                               switch_assert(vid_frame->packetlen <= SWITCH_RTP_MAX_BUF_LEN);
-                               tmp_frame = *vid_frame;
-                               tmp_frame.packet = buf;
-                               tmp_frame.data = buf + 12;
-                               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);
+                               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);
+                                       tmp_frame = *vid_frame;
+                                       tmp_frame.packet = buf;
+                                       tmp_frame.data = buf + 12;
+                                       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);
+                               }
                        }
                }