FS-10249: [mod_av] Audio gradually falls behind video in recordings

diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
index 73e2c1f6f187f39c16b8351e06224f8205edbd0f..63f2a307aee83240197e937fadae2eec8c1b6db7 100644 (file)
--- a/src/mod/applications/mod_av/avformat.c
+++ b/src/mod/applications/mod_av/avformat.c
@@ -444,9 +444,9 @@ static switch_status_t add_stream(MediaStream *mst, AVFormatContext *fc, AVCodec
                c->width    = mst->width;
                c->height   = mst->height;
                c->bit_rate = mm->vb;
-               mst->st->time_base.den = 1000;
+               mst->st->time_base.den = 90000;
                mst->st->time_base.num = 1;
-               c->time_base.den = 1000;
+               c->time_base.den = 90000;
                c->time_base.num = 1;
                c->gop_size      = 25; /* emit one intra frame every x frames at mmst */
                c->pix_fmt       = AV_PIX_FMT_YUV420P;
@@ -705,7 +705,7 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 {
        av_file_context_t *context = (av_file_context_t *) obj;
        void *pop = NULL;
-       switch_image_t *img = NULL, *tmp_img = NULL;
+       switch_image_t *img = NULL;
        int d_w = context->eh.video_st->width, d_h = context->eh.video_st->height;
        int size = 0, skip = 0, skip_freq = 0, skip_count = 0, skip_total = 0, skip_total_count = 0;
        uint64_t delta_avg = 0, delta_sum = 0, delta_i = 0, delta = 0, last_ts = 0;
@@ -732,17 +732,11 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
                        
                        if (!d_w) d_w = img->d_w;
                        if (!d_h) d_h = img->d_h;
-
-                       if (d_w && d_h && (d_w != img->d_w || d_h != img->d_h)) {
+                       
+                       //if (d_w && d_h && (d_w != img->d_w || d_h != img->d_h)) {
                                /* scale to match established stream */
-
-                               switch_img_scale(img, &tmp_img, d_w, d_h);
-                               if (tmp_img) {
-                                       switch_img_free(&img);
-                                       img = tmp_img;
-                                       tmp_img = NULL;
-                               }
-                       }
+                       //      switch_img_fit(&img, d_w, d_h, SWITCH_FIT_SIZE);
+                       //}
                } else {
                        continue;
                }
@@ -826,7 +820,7 @@ static void *SWITCH_THREAD_FUNC video_thread_run(switch_thread_t *thread, void *
 
                                context->eh.video_st->frame->pts = context->eh.timer->samplecount;
                        } else {
-                               context->eh.video_st->frame->pts = context->eh.timer->samplecount + 1;
+                               context->eh.video_st->frame->pts = (context->eh.timer->samplecount) + 1;
                        }
                }
 
@@ -1058,7 +1052,7 @@ SWITCH_STANDARD_APP(record_av_function)
                context.eh.mutex = mutex;
                context.eh.video_st = &video_st;
                context.eh.fc = fc;
-               if (switch_core_timer_init(&timer, "soft", 1, 1, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
+               if (switch_core_timer_init(&timer, "soft", 1, 90, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Timer Activation Fail\n");
                        goto end;
                }
@@ -1854,7 +1848,7 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
                if (context->has_video) {
                        switch_queue_create(&context->eh.video_queue, context->read_fps, handle->memory_pool);
                        switch_mutex_init(&context->eh.mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
-                       switch_core_timer_init(&context->video_timer, "soft", 66, 1, context->pool);
+                       switch_core_timer_init(&context->video_timer, "soft", (int)(1000.0f / context->read_fps), 1, context->pool);
                }
 
                {
@@ -2599,7 +2593,7 @@ static switch_status_t av_file_write_video(switch_file_handle_t *handle, switch_
                        switch_threadattr_create(&thd_attr, handle->memory_pool);
                        //switch_threadattr_priority_set(thd_attr, SWITCH_PRI_REALTIME);
                        switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
-                       switch_core_timer_init(&context->video_timer, "soft", 1, 1, context->pool);
+                       switch_core_timer_init(&context->video_timer, "soft", 1, 90, context->pool);
                        context->eh.timer = &context->video_timer;
                        context->audio_st.frame->pts = 0;
                        context->audio_st.next_pts = 0;

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index a465a43b55114833120723cd1b389095d215af13..cc3bbd1b863d60981cb01bdab7dbefe618ad398d 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -12177,7 +12177,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
                                const char *val;
                                int ok = 0;
 
-                               if ((!(val = switch_channel_get_variable(session->channel, "rtp_jitter_buffer_during_bridge")) || switch_false(val))) {
+                               if (!switch_channel_test_flag(session->channel, CF_VIDEO_READY) && 
+                                       (!(val = switch_channel_get_variable(session->channel, "rtp_jitter_buffer_during_bridge")) || switch_false(val))) {
                                        if (switch_channel_test_flag(session->channel, CF_JITTERBUFFER) && switch_channel_test_cap_partner(session->channel, CC_FS_RTP)) {
                                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
                                                                                  "%s PAUSE Jitterbuffer\n", switch_channel_get_name(session->channel));

diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c
index 83892017ab99a78ea1623fefd01487d92cb7b61c..94fe4a445635f683a20689aaafdfdbb12cc7d4f2 100644 (file)
--- a/src/switch_core_media_bug.c
+++ b/src/switch_core_media_bug.c
@@ -600,6 +600,11 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
        switch_timer_t timer = { 0 };
        switch_mm_t mm = { 0 };
        int fps = 15;
+       int vw = 1280;
+       int vh = 720;
+       int last_w = 0, last_h = 0, other_last_w = 0, other_last_h = 0;
+       switch_rgb_color_t color = { 0 };
+       switch_color_set_rgb(&color, "#000000");
 
        buf = switch_core_session_alloc(bug->session, buflen);
        frame.packet = buf;
@@ -626,6 +631,9 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
                fps = (int) mm.fps;
        }
 
+       if (mm.vw) vw = mm.vw;
+       if (mm.vh) vh = mm.vh;
+
        switch_core_timer_init(&timer, "soft", 1000 / fps, (90000 / (1000 / fps)), NULL);
 
        while (bug->ready) {
@@ -642,6 +650,9 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
 
                flush_video_queue(main_q, 1);
 
+               w = vw / 2;
+               h = vh;
+
                if ((status = switch_queue_trypop(main_q, &pop)) == SWITCH_STATUS_SUCCESS) {
                        switch_img_free(&img);
 
@@ -652,65 +663,62 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *
                        img = (switch_image_t *) pop;
                        new_main = 1;
 
-                       w = img->d_w;
-                       h = img->d_h;
+                       if (IMG && !(last_w == img->d_w && last_h == img->d_h)) {
+                               switch_img_fill(IMG, 0, 0, w, h, &color);
+                       }
+
+                       last_w = img->d_w;
+                       last_h = img->d_h;
                }
                
                if (other_q) {
                        flush_video_queue(other_q, 1);
-                       
+
                        if ((status = switch_queue_trypop(other_q, &other_pop)) == SWITCH_STATUS_SUCCESS) {
                                switch_img_free(&other_img);
                                other_img = (switch_image_t *) other_pop;
-                               new_other = 1;
-                       }
-
-                       if (other_img) {
-                               if (!w) w = other_img->d_w;
-                               if (!h) h = other_img->d_h;
-                               
-                               if (other_img->d_w != w || other_img->d_h != h) {
-                                       switch_image_t *tmp_img = NULL;
 
-                                       switch_img_scale(other_img, &tmp_img, w, h);
-                                       switch_img_free(&other_img);
-                                       other_img = tmp_img;
+                               if (IMG && !(other_last_w == other_img->d_w && other_last_h == other_img->d_h)) {
+                                       switch_img_fill(IMG, w, 0, w, h, &color);
                                }
-                       }
-
-                       if (!(w&&h)) continue;
 
-                       if (img) {
-                               if (img->d_w != w || img->d_h != h) {
-                                       switch_image_t *tmp_img = NULL;
-                                       
-                                       switch_img_scale(img, &tmp_img, w, h);
-                                       switch_img_free(&img);
-                                       img = tmp_img;
-                               }
+                               other_last_w = other_img->d_w;
+                               other_last_h = other_img->d_h;
+                               new_other = 1;
                        }
+
                        
-                       w *= 2;
+                       if (img && new_main) {
+                               switch_img_fit(&img, w, h, SWITCH_FIT_SIZE);
+                       }
 
-                       if (!IMG || IMG->d_h != h || IMG->d_w != w) {
-                               switch_rgb_color_t color = { 0 };
+                       if (other_img && new_other) {
+                               switch_img_fit(&other_img, w, h, SWITCH_FIT_SIZE);
+                       }
 
-                               switch_img_free(&IMG);
-                               IMG = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, w, h, 1);
+                       if (!IMG) {
+                               IMG = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, vw, vh, 1);
                                new_canvas = 1;
-                               switch_color_set_rgb(&color, "#000000");
                                switch_img_fill(IMG, 0, 0, IMG->d_w, IMG->d_h, &color);
                        }
                }
 
                
                if (IMG) {
+
+
                        if (img && (new_canvas || new_main)) {
-                               switch_img_patch(IMG, img, 0, 0);
+                               int x = 0, y = 0;
+                               switch_img_find_position(POS_CENTER_MID, w, h, img->d_w, img->d_h, &x, &y);
+
+                               switch_img_patch(IMG, img, x, y);
                        }
                
                        if (other_img && (new_canvas || new_other)) {
-                               switch_img_patch(IMG, other_img, w / 2, 0);
+                               int x = 0, y = 0;
+                               switch_img_find_position(POS_CENTER_MID, w, h, other_img->d_w, other_img->d_h, &x, &y);
+
+                               switch_img_patch(IMG, other_img, w + x, y);
                        }
                }