From patchwork Tue May 4 19:04:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kacper_Michaj=C5=82ow?= X-Patchwork-Id: 27586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp691692iob; Tue, 4 May 2021 12:33:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyC3P/mX4E3ggZokXyT6nIXBwuZE6pjH8nhTn3gPm5a+8sfrsuCIic8u2vgMOphB/OzDUXF X-Received: by 2002:aa7:c896:: with SMTP id p22mr4354244eds.225.1620156838770; Tue, 04 May 2021 12:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620156838; cv=none; d=google.com; s=arc-20160816; b=Bj+NCNQlhXZV0vnlb1UUsPzZvB/TjPrB5IWmcNZVO3vFp+3d0u/EjjXteqNTlqt94N rX7XNq50AgiXVMsplY3R6q4voIcb7On0rYymTCrBUn46+8noU/mGIO+RLz5/mnaBoqkC b/0V9/4rRX4qkVvq9i7hyuTPmKeaAUY1oDXTTXNQQN7ZmIlMzPe1jx87LLqCs6qM5/0r KxRoyOVgohfw5Hdey65eLmakm4jjEXquhY4fRft5prNeiz7RAVv0dtBjr80zFo1HLZC2 lu9gThOxndxwc3z2SRtWu35TfPuGVJZLJnPiTbyRAqiNTgsqmS0r92l3hTXwpJiCMTkZ ufYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=q+eX294xlGSsOqJnE+txmrC/OgRrSgtjhLsxlmPo7h4=; b=IOHqI1EgxWUEkQ065piheoBzmHiy9eYarF5fRSAsaKpnW6vqZd0qE5BMnKu8NxGNqm xUB0qtQnnkvAQs9xOxN6FZxVa7fcyA13aWwBFDdQaZZndSusJfR5Y/98L90Ikk16icfP W6M+kEl64HROSx4nEdvV4HMH4xZsMZSsaKb7/Kzgp1BMg6+1EkD0HFPUKhgcqIBzvp95 CFbqLW9LSE9IT96WyX10oZMlJLIrd/HIInp84eTcR+fsLLMHBEV2PjtOIwYWcrnIvChi Za+Tacez5FjBcSGfvytzuAMoVWKRfTrCGN1E/EFVVm+im9yaPCA4Y+Gf9BzqsvrmPQ8y PpJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Xmga8EaC; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c14si767916edr.409.2021.05.04.12.33.58; Tue, 04 May 2021 12:33:58 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Xmga8EaC; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0970680967; Tue, 4 May 2021 22:33:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 553E56806A2 for ; Tue, 4 May 2021 22:33:48 +0300 (EEST) Received: by mail-lj1-f176.google.com with SMTP id u20so12584056lja.13 for ; Tue, 04 May 2021 12:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dkOZTUqqORixdvJztBTUBnPaM8IvU4ttE1JE2kGMudw=; b=Xmga8EaCfcuK0JkUXH7qQ1MW3tuw6zUXRluLAag7jbOTXWaIwqy16eowrfBPNK/yYm dR1abLSoE2sVJ4iKZBlV7/RUXM8y7nmghxZUaCZ9zgI2B9jPNQWkCRPpGERYJtXnRQ64 WeLexdqzwDJNcMiv2q9+qChBB5oU4l/qxe73bjsEIod9YwCCg/a4h7E27ma1ePvWgJG7 B6j7bR8oxmxyyj7UReCW/BZtecKieThNEEaJ5Jxy+P20i6eGBbpIEJ0kfv2PAn1Za870 NNwn0uDzGn/E0F8Zw1OLMIiruHeNVnDpHU+lKbVTkSIp6CYoDcHZrTQJ3UHJNvSGBB74 r+Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dkOZTUqqORixdvJztBTUBnPaM8IvU4ttE1JE2kGMudw=; b=I3nS8j9iai/dElrVscxhlxWcdVWjjLOhtiG9axGSsoPzWjmhqBlqm7Ms19ILrgvp9O Y9vEaCFuk86A8mS5jvuRAkm6xBXBnuaEAa680uRykzVIqtplV/HJG5pbR4LebSOn2Kps 6EqazxkqgTyjLglZX2d7qm/HVEyhARmNNib6GXWhc6LNHx5N30RRt+eOkbQoSg3PESKD irLFXOiFypQPETHsrTpYfCjuM9HJfrY1WIYOrkRDaVc66MAMZT64OuGxEyM7Uq+fdQs9 PxFqh+tjhLOTQla+qbAvaceu7EULwnrp5yC79YUp6G/7+FMV4vKdZCm4atU5Lulv69Jx +4xQ== X-Gm-Message-State: AOAM532PDivrrEIGhJ9xj4lVvGdK6lDnBMCfihcoja3nXKj5/4h/yWhL Lj72wb5rV///2DxkoZK82wnmEHn53bk= X-Received: by 2002:a05:6512:208d:: with SMTP id t13mr17281203lfr.48.1620155119774; Tue, 04 May 2021 12:05:19 -0700 (PDT) Received: from localhost.localdomain ([2001:470:61c7:0:6199:fb1a:4698:5095]) by smtp.gmail.com with ESMTPSA id j21sm378362lja.72.2021.05.04.12.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 12:05:19 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 May 2021 21:04:59 +0200 Message-Id: <20210504190459.2380-1-kasper93@gmail.com> X-Mailer: git-send-email 2.28.0.308.g675a4aaf3b MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/[vf_nnedi, vf_estdif]: Check interlaced flag on correct frame 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 Cc: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hFSpavJm2gaq Fixes regression in vf_nnedi after 24dc6d386c6f7edb8f6945319f53a7f0b1642bb8 and vf_estdif while at it. Signed-off-by: Kacper Michajłow --- libavfilter/vf_estdif.c | 2 +- libavfilter/vf_nnedi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index 9dda604d3c..900e28ce67 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -500,7 +500,7 @@ static int config_input(AVFilterLink *inlink) return 0; } - if ((s->deint && !in->interlaced_frame) || ctx->is_disabled) { + if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) { s->prev->pts *= 2; ret = ff_filter_frame(ctx->outputs[0], s->prev); s->prev = in; diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 6096e88812..686091ac8d 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -695,7 +695,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return 0; } - if ((s->deint && !in->interlaced_frame) || ctx->is_disabled) { + if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) { s->prev->pts *= 2; ret = ff_filter_frame(ctx->outputs[0], s->prev); s->prev = in;