From patchwork Sun Apr 5 00:05:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18656 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:c987:0:0:0:0:0 with SMTP id b7csp73488qvk; Sat, 4 Apr 2020 17:06:10 -0700 (PDT) X-Google-Smtp-Source: APiQypJrOydojJrJDr9ejFJMCUU8yVj4Od1N4uIKSsQEb9gZnAKq3gULNYZzQWk3ty2o8mdYPrlU X-Received: by 2002:aa7:c681:: with SMTP id n1mr13973282edq.83.1586045170463; Sat, 04 Apr 2020 17:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586045170; cv=none; d=google.com; s=arc-20160816; b=w3/hizZ8NpXGyb3vYm7jH62oLxUExjcgR28U6Ut7x9ugF7QRZAKL4rCm06ffmlofti 0SMNByyyJ91/h1vteZksO/Ss1SNX5vDzJIX6hg9sTp83NfVoz35EqRdTUuFnZh2pL0Z1 79iB4MJHnp4Gct/O9udkbgXIhPHC+0CmBg1CgyFrt2gK3marh3racokJQIQ7Rej9RaMY 1BaPoSQYBjBBTWhuck6kSO6CU89alXoxwhTFY/GwYG17u3D7htBqhnJezcYXlC/Iy5mq Vcy71FWR4Mw03oUvBsE2jKGVmDxYhzjro6jshgOH4AswAUKNLCH9/O9f42c5MZMjPa7Z /yYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:in-reply-to:references:mime-version :dkim-signature:delivered-to; bh=DqXVvd1wKCCDSZqqOZou5/6O9PIHO2fPMkEFQOJNcSM=; b=X3ih3nIJFRwdBDrs2ME8xmiKRFNE+VJKNsllq6DPAAs5pjTBX2WEVNzMtRMfj2JvjV 9vvUmT/rwf9ubCxAnlM5BM8jnV7mB8QsM8TdZGJCKR1c0oMz91z4U40LDuuxKDssVrNm 5FtBFeHjAhQvlMshKj7dEENIrkWJ4MgQTSfp/XzRjrUywXWvSgqyAr7kTj6u1zEyvd4m Nwioxf0RTOl8pr5daEPgmAbXp/ErS87PH9NNKy0buWlwUTqAzzcn1kBA2xfg4dPp5AU5 lsKKyAdsJl+7Z5HUBN/Pu3/w51+q7CEsC82sbjlJqJQeaD/0S4VNPZPHa9oOYrzX8gnL AEJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pv2wcZbU; 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 r20si8540609eds.250.2020.04.04.17.06.10; Sat, 04 Apr 2020 17:06:10 -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=pv2wcZbU; 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 C198368B55B; Sun, 5 Apr 2020 03:06:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAA9A68B53C for ; Sun, 5 Apr 2020 03:06:01 +0300 (EEST) Received: by mail-il1-f177.google.com with SMTP id t6so11185159ilj.8 for ; Sat, 04 Apr 2020 17:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=yT6+wApapkY6uWDVMLEDSS4dylEWfrkYn9kQ5FKTQGA=; b=pv2wcZbUbn5CG9rnh4TrC1cNjpUvEbBkymPZlfH+jXK/V3400wYdHa2Ezq52QR+u1a qhXbhp3tOLQKEQlxmyuxMMQQhKnRoGRg/ILoZIhrzZBklvXRPiOzZ7v4M3wKgIy1Z1EI r9Hg3xRG6AlODTG9vmSyCaJX/BhbPYqjx49bQK8/yoWcb86y9oniFX1nxZQcTQ2B+hTv mqYEMURZCB5NHzMJPeRAsxl0rRf3ehw3CLNhYasPlE5Q4+2qQhlLHXP98o2EfnQAzsm3 wmqJ3VtKKf8yOXlpFUDx+miUNLLpeJBiaixASOM+OQNE8Lumh2MV/zXcn1CAISRivC6e PgiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=yT6+wApapkY6uWDVMLEDSS4dylEWfrkYn9kQ5FKTQGA=; b=cdH5V6dlxJmOVV07PVvw2zWVpd/7708pxz0z1yA09Z2JbbRcVpfjfcG+xJaxnZpluG HR/F4iAZSvLtvVwLI6pWRPxq7bWyyt+6rVB+gqVX4RO7hRBsgNCstr0lExnEb7n4wZ43 WQA6em+FkOIKZ3RAopkrABaO5l86P/lf0/KCkt8oT3peRqlCxiJ5bUQwa/sNHlSwmK8P 29kDi/TX9cWc/P6jvTw7XsYwtJkezR4OQMrtp8Ce8h7drs/BzCsl8m0+lfysANIiKwLG afaP719+ynDetapjcgISvqC4JTdWALrmSStMHbQwXYL3f+DUN6qXFQcPyUTJaRY/8GyU VuwQ== X-Gm-Message-State: AGi0PuYuLVXSYwiwbu9SdtE8SyzngJIQxdY38Tn/iZf/hvcrBCNCOPPs WJyaOssgEDXcanPbO+qBP5dtXVXuylJsAfD9ddglNg== X-Received: by 2002:a05:6e02:4c:: with SMTP id i12mr15394099ilr.211.1586045160533; Sat, 04 Apr 2020 17:06:00 -0700 (PDT) MIME-Version: 1.0 References: <2f2a6d20-a2e2-e1ae-4c26-df232c2c5c8e@gmail.com> In-Reply-To: From: Carl Eugen Hoyos Date: Sun, 5 Apr 2020 02:05:49 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH v4]lavfi/telecine: Mark telecined frames as interlaced X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: +PXm7tmAQWH7 Content-Length: 5067 Am So., 5. Apr. 2020 um 01:02 Uhr schrieb Carl Eugen Hoyos : > > Am Sa., 4. Apr. 2020 um 00:44 Uhr schrieb Carl Eugen Hoyos : > > > > Am Sa., 4. Apr. 2020 um 00:40 Uhr schrieb James Almer : > > > > > > On 4/3/2020 6:37 PM, Carl Eugen Hoyos wrote: > > > > Am Fr., 3. Apr. 2020 um 23:19 Uhr schrieb Carl Eugen Hoyos : > > > > > > > >> Attached patch marks actually telecined frames as interlaced, > > > >> other frames as progressive. > > > > > > > > New patch with changes to fate attached. > > > > > > > > Please comment, Carl Eugen > > > > > > Those yadif tests look wrong. The patch shouldn't affect them. > > > > Clearly, thank you! > > > > New patch attached, it should now only change the telecined > > frames and leave the other frames as they are, the setfield > > filter can be used to force a progressive setting for them. > > New patch attached that also sets top_field_first Which had the effect that fate is correct again, new patch attached. Please comment, Carl Eugen From cd2f7b4336c1d0b786ba613d525830ff152788a3 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 5 Apr 2020 01:00:44 +0200 Subject: [PATCH] lavfi/telecine: Mark telecined frames as interlaced. --- libavfilter/vf_telecine.c | 8 ++++++++ tests/ref/fate/filter-pixfmts-fieldmatch | 10 +++++----- tests/ref/fate/filter-pixfmts-pullup | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c index 62599a7a3a..ff8151dfc9 100644 --- a/libavfilter/vf_telecine.c +++ b/libavfilter/vf_telecine.c @@ -207,6 +207,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) s->stride[i], (s->planeheight[i] - !s->first_field + 1) / 2); } + s->frame[nout]->interlaced_frame = 1; + s->frame[nout]->top_field_first = !s->first_field; nout++; len--; s->occupied = 0; @@ -220,6 +222,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) inpicref->data[i], inpicref->linesize[i], s->stride[i], s->planeheight[i]); + s->frame[nout]->interlaced_frame = inpicref->interlaced_frame; + s->frame[nout]->top_field_first = inpicref->top_field_first; nout++; len -= 2; } @@ -236,6 +240,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) for (i = 0; i < nout; i++) { AVFrame *frame = av_frame_clone(s->frame[i]); + int interlaced = frame->interlaced_frame; + int tff = frame->top_field_first; if (!frame) { av_frame_free(&inpicref); @@ -243,6 +249,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) } av_frame_copy_props(frame, inpicref); + frame->interlaced_frame = interlaced; + frame->top_field_first = tff; frame->pts = ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time) + av_rescale(outlink->frame_count_in, s->ts_unit.num, s->ts_unit.den); -- 2.24.1