From ba5f0d0b2806755e7a04f7a9bb1f7ee5308328a2 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 27 Nov 2017 18:08:14 -0600
Subject: [PATCH] FS-10769: [mod_av,mod_conference] Lipsync issues in
 conference recording

---
 src/mod/applications/mod_av/avformat.c        | 44 +++++++++++++------
 .../mod_conference/conference_video.c         |  5 ++-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
index 2e97a264d2..644261699f 100644
--- a/src/mod/applications/mod_av/avformat.c
+++ b/src/mod/applications/mod_av/avformat.c
@@ -130,6 +130,8 @@ struct av_file_context {
 	switch_file_handle_t *handle;
 	int16_t *mux_buf;
 	switch_size_t mux_buf_len;
+
+	switch_time_t last_vid_write;
 };
 
 typedef struct av_file_context av_file_context_t;
@@ -1845,8 +1847,8 @@ static switch_status_t av_file_write(switch_file_handle_t *handle, void *data, s
 	// uint32_t size = 0;
 	uint32_t bytes;
 	int inuse;
-	int sample_start;
-	
+	int sample_start = 0;
+
 	if (!switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
 		return SWITCH_STATUS_FALSE;
 	}
@@ -1901,12 +1903,38 @@ GCC_DIAG_ON(deprecated-declarations)
 		}
 	}
 
+
+	 if (context->video_timer.interval) {
+		 int delta;
+		 switch_core_timer_sync(&context->video_timer);
+
+		 delta = context->video_timer.samplecount - context->last_vid_write;
+
+		 if (delta >= 60) {
+			 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Video timer sync: %ld/%d %ld\n", context->audio_st[0].next_pts, context->video_timer.samplecount, context->audio_st[0].next_pts- context->video_timer.samplecount);
+			 sample_start = context->video_timer.samplecount * (handle->samplerate / 1000);
+		 }
+		 
+		 context->last_vid_write = context->video_timer.samplecount;		 
+	 }
+
+	 
+	 if (sample_start) {
+		 int j = 0;
+		 
+		 for (j = 0; j < 2; j++) {
+			 if (context->audio_st[j].active) {
+				 context->audio_st[j].next_pts = sample_start;
+			 }
+		 }
+	 }
+ 
 	while ((inuse = switch_buffer_inuse(context->audio_buffer)) >= bytes) {
 		AVPacket pkt[2] = { {0} };
 		int got_packet[2] = {0};
 		int j = 0, ret = -1, audio_stream_count = 1;
 		AVFrame *use_frame = NULL;
-		
+
 		av_init_packet(&pkt[0]);
 		av_init_packet(&pkt[1]);
 
@@ -1936,16 +1964,6 @@ GCC_DIAG_ON(deprecated-declarations)
  			switch_buffer_read(context->audio_buffer, context->audio_st[0].frame->data[0], bytes);
 		}
 
-		/* Sync all audio stream timestamps to video timer */
-		if (context->video_timer.interval) {
-			switch_core_timer_sync(&context->video_timer);
-			sample_start = context->video_timer.samplecount * (handle->samplerate / 1000);
-
-			for (j = 0; j < audio_stream_count; j++) {
-				context->audio_st[j].next_pts = sample_start;
-			}
-		}
-		
 		for (j = 0; j < audio_stream_count; j++) {
 			
 			av_frame_make_writable(context->audio_st[j].frame);
diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 93bb35a9d4..547e88c326 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -3071,7 +3071,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 		canvas->video_count = last_video_count = video_count;
 		switch_mutex_unlock(conference->member_mutex);
 
-		switch_core_timer_next(&canvas->timer);
+		if (canvas->playing_video_file) {
+			switch_core_timer_next(&canvas->timer);
+		}
 
 		now = switch_micro_time_now();
 
@@ -3841,6 +3843,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 					}
 				}
 
+				switch_core_timer_next(&canvas->timer);
 				wait_for_canvas(canvas);
 
 				for (i = 0; i < canvas->total_layers; i++) {