It is only used in filter() and always set immediately before filter() is called, so it can be passed as a parameter instead.
Unified · Split
| @@ -48,7 +48,6 @@ typedef struct ESTDIFContext { · 47 unmodified lines | ||
| 48 | 48 | int max; |
| 49 | 49 | int nb_planes; |
| 50 | 50 | int nb_threads; |
| 51 | − int64_t pts; | |
| 52 | 51 | AVFrame *prev; |
| 53 | 52 | |
| 54 | 53 | void (*interpolate)(struct ESTDIFContext *s, uint8_t *dst, |
| @@ -433,7 +432,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, · 378 unmodified lines | ||
| 433 | 432 | return 0; |
| 434 | 433 | } |
| 435 | 434 | |
| 436 | −static int filter(AVFilterContext *ctx, AVFrame *in) | |
| 435 | +static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts) | |
| 437 | 436 | { |
| 438 | 437 | ESTDIFContext *s = ctx->priv; |
| 439 | 438 | AVFilterLink *outlink = ctx->outputs[0]; |
| @@ -445,7 +444,7 @@ static int filter(AVFilterContext *ctx, AVFrame *in) · 5 unmodified lines | ||
| 445 | 444 | return AVERROR(ENOMEM); |
| 446 | 445 | av_frame_copy_props(out, in); |
| 447 | 446 | out->interlaced_frame = 0; |
| 448 | − out->pts = s->pts; | |
| 447 | + out->pts = pts; | |
| 449 | 448 | |
| 450 | 449 | td.out = out; td.in = in; |
| 451 | 450 | ff_filter_execute(ctx, deinterlace_slice, &td, NULL, |
| @@ -509,16 +508,14 @@ static int config_input(AVFilterLink *inlink) · 57 unmodified lines | ||
| 509 | 508 | return ret; |
| 510 | 509 | } |
| 511 | 510 | |
| 512 | − s->pts = s->prev->pts * 2; | |
| 513 | − ret = filter(ctx, s->prev); | |
| 511 | + ret = filter(ctx, s->prev, s->prev->pts * 2); | |
| 514 | 512 | if (ret < 0 || s->mode == 0) { |
| 515 | 513 | av_frame_free(&s->prev); |
| 516 | 514 | s->prev = in; |
| 517 | 515 | return ret; |
| 518 | 516 | } |
| 519 | 517 | |
| 520 | − s->pts = s->prev->pts + in->pts; | |
| 521 | − ret = filter(ctx, s->prev); | |
| 518 | + ret = filter(ctx, s->prev, s->prev->pts + in->pts); | |
| 522 | 519 | av_frame_free(&s->prev); |
| 523 | 520 | s->prev = in; |
| 524 | 521 | return ret; |