diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index cdaaf7d..3279161 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -24,7 +24,7 @@ * filter for upsampling or downsampling a progressive source */ -#define DEBUG +/* #define DEBUG */ #include "libavutil/avassert.h" #include "libavutil/cpu.h" @@ -199,7 +199,7 @@ #ifdef DEBUG av_dlog(ctx, "process_work_frame()\n"); - av_dlog(ctx, "process_work_frame() pending_input_frames %d\n", priv_ctx->pending_srce_frames); + av_dlog(ctx, "process_work_frame() pending_input_frames:%d\n", priv_ctx->pending_srce_frames); if (priv_ctx->srce[prev]) av_dlog(ctx, "process_work_frame() srce prev pts:%"PRId64"\n", priv_ctx->srce[prev]->pts); if (priv_ctx->srce[crnt]) av_dlog(ctx, "process_work_frame() srce crnt pts:%"PRId64"\n", priv_ctx->srce[crnt]->pts); @@ -405,6 +405,18 @@ av_assert0(priv_ctx->srce[next]); av_assert0(priv_ctx->srce[crnt]); +#ifdef DEBUG + av_dlog(ctx, "set_work_frame_pts() srce crnt pts:%"PRId64"\n", priv_ctx->srce[crnt]->pts); + av_dlog(ctx, "set_work_frame_pts() srce next pts:%"PRId64"\n", priv_ctx->srce[next]->pts); + if (priv_ctx->srce[prev]) { + av_dlog(ctx, "set_work_frame_pts() srce prev pts:%"PRId64"\n", priv_ctx->srce[prev]->pts); + } +#endif + + average_srce_pts_delta = priv_ctx->average_srce_pts_dest_delta; +#ifdef DEBUG + av_dlog(ctx, "set_work_frame_pts() initial average srce pts:%d\n", average_srce_pts_delta); +#endif // calculate the PTS delta if ((pts = (priv_ctx->srce[next]->pts - priv_ctx->srce[crnt]->pts))) { average_srce_pts_delta = average_srce_pts_delta?((average_srce_pts_delta+pts)>>1):pts; @@ -413,9 +425,10 @@ } priv_ctx->average_srce_pts_dest_delta = av_rescale_q(average_srce_pts_delta, priv_ctx->srce_time_base, priv_ctx->dest_time_base); + #ifdef DEBUG - av_dlog(ctx, "set_work_frame_pts() average srce pts:%d\n", average_srce_pts_delta); - av_dlog(ctx, "set_work_frame_pts() average srce pts:%d at dest time base:%u/%u\n", + av_dlog(ctx, "set_work_frame_pts() calculated average srce pts:%d\n", average_srce_pts_delta); + av_dlog(ctx, "set_work_frame_pts() calculated average srce pts:%d at dest time base:%u/%u\n", priv_ctx->average_srce_pts_dest_delta, priv_ctx->dest_time_base.num, priv_ctx->dest_time_base.den); #endif @@ -436,7 +449,7 @@ // av_log(ctx, AV_LOG_DEBUG, "set_frame_pts() average output pts from input timebase\n"); #ifdef DEBUG - av_dlog(ctx, "set_work_frame_pts() average dest pts:%d\n", priv_ctx->average_dest_pts_delta); + av_dlog(ctx, "set_work_frame_pts() calculated average dest pts:%d\n", priv_ctx->average_dest_pts_delta); #endif // } // else { @@ -454,7 +467,7 @@ } #ifdef DEBUG - av_dlog(ctx, "set_work_frame_pts() calculated pts:%"PRId64" at dest time base:%u/%u\n", + av_dlog(ctx, "set_work_frame_pts() calculated dest pts:%"PRId64" at dest time base:%u/%u\n", priv_ctx->work->pts, priv_ctx->dest_time_base.num, priv_ctx->dest_time_base.den); #endif }