From patchwork Sat Apr 4 23:02:18 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: 18654 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:c987:0:0:0:0:0 with SMTP id b7csp34399qvk; Sat, 4 Apr 2020 16:02:41 -0700 (PDT) X-Google-Smtp-Source: APiQypI7/ZZYTLR3asfdfrgyoYV0nG1FSkzOeD7ZRKP2kpPhoYXabEJuqbS6beo/ORXasl1tiVs1 X-Received: by 2002:aa7:c809:: with SMTP id a9mr13271930edt.180.1586041360799; Sat, 04 Apr 2020 16:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586041360; cv=none; d=google.com; s=arc-20160816; b=vyr+UnOXhGkDMrczArk8zXuaMn05YrzaCY70nMT9+xIR1svSyR9uMvG/54LlrKjtEa 8GwQ+ymBPd3pjBEfzsk1SYKGZTxTjzyHVQt1/tA9ZV/tLLnlQQFaMZcfjGrFV7fEt3GT znhuuL0zJcr/D8mTHOftO68kbiN2zQYjFltG2L5pbyW4po/ZScLWwSfpu/5QAm9y056a f7SoddtVv7rh7PfiERgTvHGCQA041vN7KVySCCI+blrxTiijvUrP3QpF9TeDXISTnO7F KUTRBPZAtbgHzOR3TXNuxgqNTlugTMX3BOp5QRrd9QZxFRtYseYofrBJ8iDKTyMb9v3c b8kg== 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=VNmId60CLmp5rQE0tBz1yYq+NJ+Lpli+EQMQYJbiHdA=; b=Fwr77/l5JfnWdlcRY1FVuCvHXzaDLlQr/tP/zIXymGGFqK/Xd8s+Vzf5O3uz/VsY8Z ZHJEZ4Xu0/l7aukLa7LPn0kAbYdr9l8Ofh151HJfKxVp+8miJIobZ0x6f9y0kpNmAJ+9 ehOVDhrEoIVqbcTksfRstpmu0eQUXe51Fg8E6+RbE/KvUJWh/pSLAyS7N4CT0CiAI6p2 z3JN++mJIfziRq752zsmzolI39lxfDinXjQzskuTYhJFlWvgKCEjYeUmlEdqwUHE0Ms+ AoOCE2D2oVfyLF9aprDNtTsZFbvEJcN0THTn2v5UJtwEczNocqPiexw5lRafXkPPKYGD efZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=L4Smn2rF; 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 c19si4417757ejk.126.2020.04.04.16.02.40; Sat, 04 Apr 2020 16:02:40 -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=L4Smn2rF; 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 0FA5F68B035; Sun, 5 Apr 2020 02:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66A7568B035 for ; Sun, 5 Apr 2020 02:02:31 +0300 (EEST) Received: by mail-il1-f196.google.com with SMTP id r5so11160214ilq.6 for ; Sat, 04 Apr 2020 16:02:31 -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=0hJ6rVBZYjS5QM+WSbO6CH04GXDpwJPDF2NiENc+GpY=; b=L4Smn2rFx0Qxb4mLC8T3nA5pL6f5RLdQcqYDGOa0nE2coFZyIny8DIfdNs1GNUGO1Q Y/YLt0rQUZ6boa3uOLutB8rMhY609w+DYhtocFId05fxBpq/GPrk2t60/cgU/hXq0JTf 4x2Jppl4llLtESRuYf2gv+Zbx1nRJVBFttF1RIPTYots9dUN0PEK6/SNFtgZlvFG7PWs 0nST4M4Bp4X4PydR25BGf1J0nFBR0UedGCiCah12Sl5fMgtgzwTkgMD68p5QZv2NgZhC XVcI8xlSt1+FySFhW9Ue+b5afizTuq9XkibeMdGzdcYFTuh51oHNTm+AKkY/yfr6ccW/ FluA== 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=0hJ6rVBZYjS5QM+WSbO6CH04GXDpwJPDF2NiENc+GpY=; b=XqNMm9ow8bNDRKbbuAQcFd0PitkGR3UaO4w7gx0KiRFTB9TrZ5u4Pd6TJqglNDzI/w PEydf3uMex+rO8L8XkHZkNN27lun/3FJNcpnfD7tdRYG/xi1u2/2rLeZZ7OAqcF88tZh Hdt7agl/9vADkxhhbkXATMKedYoYDI0YVH/ObgJ+U7u1meaFRmBUker5uUXgzb8CXX+3 pPaTerY8j/l9UhQ83VnqqhNVIJtR7Q8BiPDnmF3K700EIBT+4k7plXZ7PnR7hHu300/v Mrgw43tLikLBz0kEwAkyuLYER/WfJBzTF4wWfsGoEkkgyx30UGpHsG3R/v1tIqN5Z7Ar 4S9A== X-Gm-Message-State: AGi0PubuIv5jX315yoS3nrbFmfJCOynaUascbbjHZJis1xnUDZeCvC9b VqV+lB9X+T62kZUKw7wbewse62e7lY2sm7FgBvEKqw== X-Received: by 2002:a92:c00c:: with SMTP id q12mr14821745ild.125.1586041349846; Sat, 04 Apr 2020 16:02:29 -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 01:02:18 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH v3]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: XAM3fOF9f4I7 Content-Length: 7990 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 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); diff --git a/tests/ref/fate/filter-pixfmts-fieldmatch b/tests/ref/fate/filter-pixfmts-fieldmatch index c3165b872d..eb0fc3c224 100644 --- a/tests/ref/fate/filter-pixfmts-fieldmatch +++ b/tests/ref/fate/filter-pixfmts-fieldmatch @@ -1,5 +1,5 @@ -yuv410p a6c9b4065e8253d8120772f69be0bf04 -yuv411p b913e634ad37ce046240252bed8681fb -yuv420p a9286560141eb14595e427dbe5829b00 -yuv422p 11ad22ce00c5e8a30d0472f29fb15434 -yuv444p 6c5b0c1343d625d0656b6755906fd874 +yuv410p 572e4416ae6988dab3dbdbed3296b57c +yuv411p ce9ccbb1985b7840955e57c23d4bc003 +yuv420p f06c53990f577893fef6a4270aab691b +yuv422p 1c6ad2c3198ad577593214ebc9bc5705 +yuv444p 24813e175b1b09c01f5ec16149d83fce diff --git a/tests/ref/fate/filter-pixfmts-pullup b/tests/ref/fate/filter-pixfmts-pullup index c6ddb3489a..88c1dd565d 100644 --- a/tests/ref/fate/filter-pixfmts-pullup +++ b/tests/ref/fate/filter-pixfmts-pullup @@ -1,12 +1,12 @@ -gray 415c928947f83f9b45c24ad15a094bda -yuv410p 0f29d0b6394871e1e6cde484b4f351f4 -yuv411p ec059b1992e1acda472b9b2dd3e4506b -yuv420p dba6303cd02cc39cb0db7b546793d565 -yuv422p d7d3224dd900bb1b96608a28a704360d -yuv440p d4c5f20701cfceb4bbf7d75cfcc13514 -yuv444p 7e405274037e7f2ab845d7413a71e16d -yuvj411p dc602e7bd3449d16e17e695815616b1e -yuvj420p b98ec86eeef2d512aeb2fc4d32ffa656 -yuvj422p f09c3240bb662477b76ce4da34b4feed -yuvj440p 8d3ab69e2bbbbbd2f9be323c18922533 -yuvj444p 2dc27560eed5d685354796dcccce853c +gray 0af7cbb0cfb3efcb946e697c4b7bd5f9 +yuv410p c7a9e3aeb6b30eadcdf6ca5acb52c5b2 +yuv411p 2e19fb03dd57e4700ff560da3a84402e +yuv420p 7019c5de9774970eb3a7828cb92439e8 +yuv422p 8fc1c9fff0aa2566a50ff10a54e80ba7 +yuv440p 16775691a106117ecd244c45252f4ba7 +yuv444p b6ec514e4c30fea6b0dd696bf7d147d5 +yuvj411p 0b899555985616330109a2381d9828a4 +yuvj420p 1f51fe0c2c8d5ba12409bc4c821fed56 +yuvj422p 5e9a13247fe5201ea83d3a64241631e3 +yuvj440p 2e22b2e340f372792bec5ba0a8f46822 +yuvj444p becc016653bb26b472625d87dbfc10c4 -- 2.24.1