Commit fa5730d8 authored by Anton Khirnov's avatar Anton Khirnov

lavfi/vf_estdif: set frame durations

parent 62bfcc34
...@@ -432,7 +432,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, ...@@ -432,7 +432,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg,
return 0; 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; ESTDIFContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
...@@ -445,6 +445,7 @@ static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts) ...@@ -445,6 +445,7 @@ static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts)
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
out->interlaced_frame = 0; out->interlaced_frame = 0;
out->pts = pts; out->pts = pts;
out->duration = duration;
td.out = out; td.in = in; td.out = out; td.in = in;
ff_filter_execute(ctx, deinterlace_slice, &td, NULL, ff_filter_execute(ctx, deinterlace_slice, &td, NULL,
...@@ -503,19 +504,21 @@ static int config_input(AVFilterLink *inlink) ...@@ -503,19 +504,21 @@ static int config_input(AVFilterLink *inlink)
if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) { if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) {
s->prev->pts *= 2; s->prev->pts *= 2;
s->prev->duration *= 2;
ret = ff_filter_frame(ctx->outputs[0], s->prev); ret = ff_filter_frame(ctx->outputs[0], s->prev);
s->prev = in; s->prev = in;
return ret; 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) { if (ret < 0 || s->mode == 0) {
av_frame_free(&s->prev); av_frame_free(&s->prev);
s->prev = in; s->prev = in;
return ret; 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); av_frame_free(&s->prev);
s->prev = in; s->prev = in;
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment