diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-11-25 23:20:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-11-28 10:28:14 +0100 |
| commit | a186360f27cad75855f9d6efe67c68bd1deb2f15 (patch) | |
| tree | 79dbc8b0014344574f1b0f5659f07021d464e124 | |
| parent | d9534ec84e3567c5776ae24c4671d32555f9ca9f (diff) | |
fftools/ffmpeg: set AVFrame.time_base after filtering
Makes it easier to track what timebase are the frame timestamps in and
allows to stop accessing filters in code that shouldn't deal with
filtering.
| -rw-r--r-- | fftools/ffmpeg.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 263670d3f5..2ee40890a9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -678,17 +678,14 @@ static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, double float_pts = AV_NOPTS_VALUE; // this is identical to frame.pts but with higher precision AVCodecContext *enc = ost->enc_ctx; AVRational filter_tb = (AVRational){ -1, -1 }; - if (!frame || frame->pts == AV_NOPTS_VALUE || - !enc || !ost->filter || !ost->filter->graph->graph) + if (!frame || frame->pts == AV_NOPTS_VALUE || !enc) goto early_exit; { - AVFilterContext *filter = ost->filter->filter; - int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; AVRational tb = enc->time_base; int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16); - filter_tb = av_buffersink_get_time_base(filter); + filter_tb = frame->time_base; tb.den <<= extra_bits; float_pts = @@ -701,6 +698,7 @@ static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, frame->pts = av_rescale_q(frame->pts, filter_tb, enc->time_base) - av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); + frame->time_base = enc->time_base; } early_exit: @@ -1295,6 +1293,7 @@ static int reap_filters(int flush) AVRational tb = av_buffersink_get_time_base(filter); ost->last_filter_pts = av_rescale_q(filtered_frame->pts, tb, AV_TIME_BASE_Q); + filtered_frame->time_base = tb; if (debug_ts) av_log(NULL, AV_LOG_INFO, "filter_raw -> pts:%s pts_time:%s time_base:%d/%d\n", |