From 3a18464f7e732cc423e81a1319cfc1cb28da58e0 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 28 Feb 2017 17:44:16 -0600 Subject: [PATCH] FS-10076: [mod_av] File sync issues with different framerates #resolve --- src/mod/applications/mod_av/avformat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c index fc6bde2f5c..c97986ac6b 100644 --- a/src/mod/applications/mod_av/avformat.c +++ b/src/mod/applications/mod_av/avformat.c @@ -2274,6 +2274,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f return SWITCH_STATUS_BREAK; } +#if 0 if (context->last_img) { if (mst->next_pts && (switch_time_now() - mst->next_pts > max_delta)) { switch_img_free(&context->last_img); // too late @@ -2294,6 +2295,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f return SWITCH_STATUS_BREAK; } } +#endif if (st->codec->time_base.num) { ticks = st->parser ? st->parser->repeat_pict + 1 : st->codec->ticks_per_frame; @@ -2308,10 +2310,16 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f again: - if ((flags & SVR_BLOCK)) { - status = switch_queue_pop(context->eh.video_queue, &pop); + if (context->last_img) { + pop = (void *) context->last_img; + context->last_img = NULL; + status = SWITCH_STATUS_SUCCESS; } else { - status = switch_queue_trypop(context->eh.video_queue, &pop); + if ((flags & SVR_BLOCK)) { + status = switch_queue_pop(context->eh.video_queue, &pop); + } else { + status = switch_queue_trypop(context->eh.video_queue, &pop); + } } if (pop && status == SWITCH_STATUS_SUCCESS) { @@ -2354,7 +2362,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f } } - if ((flags & SVR_BLOCK) || do_fl) { + if ((flags & SVR_BLOCK)) { while (switch_micro_time_now() - mst->next_pts < -10000) { // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "yield, delta=%" SWITCH_INT64_T_FMT "\n", switch_micro_time_now() - mst->next_pts); switch_yield(1000);