From patchwork Mon Oct 10 16:10:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp443574pzb; Mon, 10 Oct 2022 09:12:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5s24zkmeuyfHSrC8yX+/YpXR60BPuKo4f24pvOdM8Y8TLFIW25Q8GnQRNsED/dDMH8cDMX X-Received: by 2002:a05:6402:5255:b0:459:ebaa:c2b8 with SMTP id t21-20020a056402525500b00459ebaac2b8mr18439257edd.150.1665418338014; Mon, 10 Oct 2022 09:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665418338; cv=none; d=google.com; s=arc-20160816; b=t6aqlI+1jki22Os+145llzU3hwq19KeZM6tzROGg8ERrvSZbd4fNNKcWhvt0KUtk5C gCvuZU2cLGJym1PDeEj+f688J6OhyIpk+MASujWHU5fb/S7AabEfjU2r3CP5A8vkhTid IFMVw7iZdPCj84pvKomAVa+8Nf/CuP++l6gPfMtoALGB2ryqr0QrgjTCjQ13SCT+lPvK mGwY9VlIwP/zR9OvFoEw8mWy1tue65I3urQeMP9McRy3sOms3xbaS35/MWIoH7adBgG6 1d/V2eTt3TuUFr2xJ7PYQ7W2yxVjLypCpBh9xSME+uTjUn1A5D5OYI+nvUTIbM+xn/Rp cszQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=l4b86QmzyrGd97D2EZ9yPhoqnB1qeXkIZmkejRZDUPA=; b=wDrwfg+F6dMkTxqscF2z1/PbwNQBFvCt2ZWfWcqU2kjcXaHF2qf3KTkrnsWRMk64oD FB6wEcri2auvwzlFYAwU1AQl8XFOoU7TC5dJ4YCnr9pOK/X08gXVRR4gmiKexdi0q17G drF64F6FCTayojQ4p90RmMaNL6UvC7zTEM016uNfx+74WEaZv51B4MnitrDG/BeWJPHn GtlMB1HBciOoPVzwIkip12Tkkj4ZMgqgGMnRmn5vuMbPUK1Gr+uTYd5fssBWel8DnIMz MWn1PPE2RsPM6UH1qdlaBF6M6IczAKikUuSWbNckVBGMEILLgaayBJxJlVxj9oy+VFYQ nSww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sa4-20020a1709076d0400b0078d4dcceb5dsi11061829ejc.717.2022.10.10.09.12.14; Mon, 10 Oct 2022 09:12:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB02468BD32; Mon, 10 Oct 2022 19:11:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CD3568BBD2 for ; Mon, 10 Oct 2022 19:11:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id AB91D2404F5 for ; Mon, 10 Oct 2022 18:11:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 75KTaSyQI4iV for ; Mon, 10 Oct 2022 18:11:10 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3DDE9240591 for ; Mon, 10 Oct 2022 18:11:07 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 13A323A168C for ; Mon, 10 Oct 2022 18:11:02 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 18:10:54 +0200 Message-Id: <20221010161055.18948-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221010161055.18948-1-anton@khirnov.net> References: <20221010161055.18948-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] lavfi/vf_estdif: drop a redundant context variable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FUG5Do4Bdy7I 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;