diff options
author | Anton Khirnov <anton@khirnov.net> | 2022-07-11 10:31:47 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2022-07-19 12:27:17 +0200 |
commit | 357ba45a5ca3864b0eba07747ab6ea1614f2646b (patch) | |
tree | bfc0cb60694b7e44535d29aa21413f506ad8b149 /libavfilter | |
parent | ac2cda4296dbbaf2580ec3aa404bb2f3a393159c (diff) |
lavfi: use AVFrame.duration instead of AVFrame.pkt_duration
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/buffersrc.c | 7 | ||||
-rw-r--r-- | libavfilter/f_loop.c | 14 | ||||
-rw-r--r-- | libavfilter/vf_deshake_opencl.c | 7 | ||||
-rw-r--r-- | libavfilter/vf_drawtext.c | 16 |
4 files changed, 44 insertions, 0 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index a3190468bb..ae8bba19b0 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -243,6 +243,13 @@ FF_ENABLE_DEPRECATION_WARNINGS } } +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS + if (copy->pkt_duration && copy->pkt_duration != copy->duration) + copy->duration = copy->pkt_duration; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + ret = ff_filter_frame(ctx->outputs[0], copy); if (ret < 0) return ret; diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c index 672aa4c8f7..d217efe2fd 100644 --- a/libavfilter/f_loop.c +++ b/libavfilter/f_loop.c @@ -331,9 +331,16 @@ static int push_frame(AVFilterContext *ctx) if (!out) return AVERROR(ENOMEM); out->pts += s->duration - s->start_pts; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS if (out->pkt_duration) duration = out->pkt_duration; else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (out->duration) + duration = out->duration; + else duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); pts = out->pts + duration; ret = ff_filter_frame(outlink, out); @@ -368,9 +375,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return AVERROR(ENOMEM); } s->nb_frames++; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS if (frame->pkt_duration) duration = frame->pkt_duration; else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (frame->duration) + duration = frame->duration; + else duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); s->duration = frame->pts + duration; ret = ff_filter_frame(outlink, frame); diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index c2b5bef897..d488da7fa0 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -1413,8 +1413,15 @@ static int filter_frame(AVFilterLink *link, AVFrame *input_frame) &debug_matches, 1); } +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS if (input_frame->pkt_duration) { duration = input_frame->pkt_duration; + } else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (input_frame->duration) { + duration = input_frame->duration; } else { duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); } diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index feb6898848..50012bb258 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -91,8 +91,11 @@ static const char *const var_names[] = { "y", "pict_type", "pkt_pos", +#if FF_API_PKT_DURATION "pkt_duration", +#endif "pkt_size", + "duration", NULL }; @@ -131,8 +134,11 @@ enum var_name { VAR_Y, VAR_PICT_TYPE, VAR_PKT_POS, +#if FF_API_PKT_DURATION VAR_PKT_DURATION, +#endif VAR_PKT_SIZE, + VAR_DURATION, VAR_VARS_NB }; @@ -1649,8 +1655,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->var_values[VAR_PICT_TYPE] = frame->pict_type; s->var_values[VAR_PKT_POS] = frame->pkt_pos; +#if FF_API_PKT_DURATION +FF_DISABLE_DEPRECATION_WARNINGS s->var_values[VAR_PKT_DURATION] = frame->pkt_duration * av_q2d(inlink->time_base); + + if (frame->pkt_duration) + s->var_values[VAR_DURATION] = frame->pkt_duration * av_q2d(inlink->time_base); + else +FF_ENABLE_DEPRECATION_WARNINGS +#endif + s->var_values[VAR_DURATION] = frame->duration * av_q2d(inlink->time_base); s->var_values[VAR_PKT_SIZE] = frame->pkt_size; + s->metadata = frame->metadata; for (int i = 0; i < loop; i++) { |