diff mbox series

[FFmpeg-devel,8/8] lavfi/vf_estdif: set frame durations

Message ID 20221010161055.18948-8-anton@khirnov.net
State Accepted
Commit fa5730d84aa05d7fb30c1ce6a5181d6d901819c7
Headers show
Series [FFmpeg-devel,1/8] lavfi/f_drawgraph: forward input frame durations | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov Oct. 10, 2022, 4:10 p.m. UTC 
---
 libavfilter/vf_estdif.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c
index 9e826fd424..0164f4638a 100644
--- a/libavfilter/vf_estdif.c
+++ b/libavfilter/vf_estdif.c
@@ -432,7 +432,7 @@  static int deinterlace_slice(AVFilterContext *ctx, void *arg,
     return 0;
 }
 
-static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts)
+static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts, int64_t duration)
 {
     ESTDIFContext *s = ctx->priv;
     AVFilterLink *outlink = ctx->outputs[0];
@@ -445,6 +445,7 @@  static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts)
     av_frame_copy_props(out, in);
     out->interlaced_frame = 0;
     out->pts = pts;
+    out->duration = duration;
 
     td.out = out; td.in = in;
     ff_filter_execute(ctx, deinterlace_slice, &td, NULL,
@@ -503,19 +504,21 @@  static int config_input(AVFilterLink *inlink)
 
     if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) {
         s->prev->pts *= 2;
+        s->prev->duration *= 2;
         ret = ff_filter_frame(ctx->outputs[0], s->prev);
         s->prev = in;
         return ret;
     }
 
-    ret = filter(ctx, s->prev, s->prev->pts * 2);
+    ret = filter(ctx, s->prev, s->prev->pts * 2,
+                 s->prev->duration * (s->mode ? 1 : 2));
     if (ret < 0 || s->mode == 0) {
         av_frame_free(&s->prev);
         s->prev = in;
         return ret;
     }
 
-    ret = filter(ctx, s->prev, s->prev->pts + in->pts);
+    ret = filter(ctx, s->prev, s->prev->pts + in->pts, in->duration);
     av_frame_free(&s->prev);
     s->prev = in;
     return ret;