FS-8589 #resolve [Using conference playback with full-screen=true is not working correctly]

src/mod/applications/mod_conference/conference_video.c

@@ -2058,9 +2058,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 			canvas->send_keyframe = 1;
 		}
 
-		if (!conference->playing_video_file) {
+		
 		switch_core_timer_next(&canvas->timer);
-		}
 
 		now = switch_micro_time_now();
 
@@ -2211,11 +2210,6 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 				continue;
 			}
 
-			if (conference->playing_video_file) {
-				switch_core_session_rwunlock(imember->session);
-				continue;
-			}
-
 			//VIDFLOOR
 			if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
 				imember->video_layer_id != canvas->layout_floor_id) {
@@ -2226,6 +2220,13 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 			layer = NULL;
 
 
+			if (conference->playing_video_file) {
+				switch_img_free(&img);
+				switch_core_session_rwunlock(imember->session);
+				continue;
+			}
+
+
 
 			switch_mutex_lock(canvas->mutex);
 
@@ -2686,15 +2687,15 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 					if (canvas->play_file) {
 						canvas->send_keyframe = 1;
 						canvas->play_file = 0;
-
-						canvas->timer.interval = 1;
-						canvas->timer.samples = 90;
 					}
 
-					write_img = file_img = write_frame.img;
+					switch_img_free(&file_img);
+					file_img = write_img = write_frame.img;
 
 					switch_core_timer_sync(&canvas->timer);
 					timestamp = canvas->timer.samplecount;
+				} else if (file_img) {
+					write_img = file_img;
 				}
 			} else if (file_img) {
 				switch_img_free(&file_img);
@@ -2893,9 +2894,7 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_
 			canvas->send_keyframe = 1;
 		}
 
-		if (!conference->playing_video_file) {
 		switch_core_timer_next(&canvas->timer);
-		}
 
 		now = switch_micro_time_now();