Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 7/8] lavfi/vf_estdif: drop a redundant context variable
Date: Mon, 10 Oct 2022 18:10:54 +0200
Message-ID: <20221010161055.18948-7-anton@khirnov.net> (raw)
In-Reply-To: <20221010161055.18948-1-anton@khirnov.net>

It is only used in filter() and always set immediately before filter()
is called, so it can be passed as a parameter instead.
---
 libavfilter/vf_estdif.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c
index 9a3195fefb..9e826fd424 100644
--- a/libavfilter/vf_estdif.c
+++ b/libavfilter/vf_estdif.c
@@ -48,7 +48,6 @@ typedef struct ESTDIFContext {
     int max;
     int nb_planes;
     int nb_threads;
-    int64_t pts;
     AVFrame *prev;
 
     void (*interpolate)(struct ESTDIFContext *s, uint8_t *dst,
@@ -433,7 +432,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg,
     return 0;
 }
 
-static int filter(AVFilterContext *ctx, AVFrame *in)
+static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts)
 {
     ESTDIFContext *s = ctx->priv;
     AVFilterLink *outlink = ctx->outputs[0];
@@ -445,7 +444,7 @@ static int filter(AVFilterContext *ctx, AVFrame *in)
         return AVERROR(ENOMEM);
     av_frame_copy_props(out, in);
     out->interlaced_frame = 0;
-    out->pts = s->pts;
+    out->pts = pts;
 
     td.out = out; td.in = in;
     ff_filter_execute(ctx, deinterlace_slice, &td, NULL,
@@ -509,16 +508,14 @@ static int config_input(AVFilterLink *inlink)
         return ret;
     }
 
-    s->pts = s->prev->pts * 2;
-    ret = filter(ctx, s->prev);
+    ret = filter(ctx, s->prev, s->prev->pts * 2);
     if (ret < 0 || s->mode == 0) {
         av_frame_free(&s->prev);
         s->prev = in;
         return ret;
     }
 
-    s->pts = s->prev->pts + in->pts;
-    ret = filter(ctx, s->prev);
+    ret = filter(ctx, s->prev, s->prev->pts + in->pts);
     av_frame_free(&s->prev);
     s->prev = in;
     return ret;
-- 
2.35.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2022-10-10 16:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-10 16:10 [FFmpeg-devel] [PATCH 1/8] lavfi/f_drawgraph: forward input frame durations Anton Khirnov
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 2/8] lavfi/settb: rescale " Anton Khirnov
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 3/8] lavfi/vf_tinterlace: set " Anton Khirnov
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 4/8] lavfi/vf_coreimage: " Anton Khirnov
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 5/8] lavfi/vf_decimate: use inverse of output framerate as timebase Anton Khirnov
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 6/8] lavfi/vf_estdif: drop an unused function parameter Anton Khirnov
2022-10-10 16:10 ` Anton Khirnov [this message]
2022-10-10 16:10 ` [FFmpeg-devel] [PATCH 8/8] lavfi/vf_estdif: set frame durations Anton Khirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221010161055.18948-7-anton@khirnov.net \
    --to=anton@khirnov.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git