From patchwork Wed Sep 13 00:46:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5127 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp346167jaa; Tue, 12 Sep 2017 17:48:03 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDb2kDOY9sE88OHxdfIQdUzMLHTslnumibl3OsiEXjBaHY72ElgmCIgtYrKmRK6+sJkO/Ye X-Received: by 10.28.193.5 with SMTP id r5mr1052756wmf.153.1505263683184; Tue, 12 Sep 2017 17:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505263683; cv=none; d=google.com; s=arc-20160816; b=uPT/ROAZsMuUAq0/TGTXzzxGJ1Hh+PNT6Kq9KaI6jNVa4J+FzPVtok04orbEmQvt5Q Zk4h+jZ/V5BdTykMkyNWMbVARfm0RPyUBKF4MQPPNXuiOnLVoBKzOkEkBP0A2d+Nr14l qjFpFSif4IwN2qvx7p8fAu3HOUJUyQIXd5rDdDYJJfG0OxNCuZzbSpj1GsWuFiwWu5d4 g09vXLM+5U10VwT7kRXd+yiIruZ88VpgP8zJvfIIqQDnikrCFGMb4wdMnzX2nbQlDD2S UXk5JsZisGNewfO5jm8e3hDAHU2VgAwzJb7DuNsHAospL4Wj/ZVtTCuaqEFzU60Gd9In g8Bg== 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:user-agent :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to:arc-authentication-results; bh=xQ6R+yeOmmEPWB41MQhnonTwmRVOpF6GGiNzEs/9B0w=; b=eC5drc+TglrYXRSxuDaHcOCPGR73q008prX2M/6GapwqDgWrAB+i5PtE+Jw/wJut5V a819EavYR95NEbjoYuCXoow5cjRvJgigbdSN/nykccSKD+9A8OK1H13cG+jpJrWi7rdF iyoZGhPIVOfkujHgs4e+NpmSNGgDkf2iX+0JXNQ8KYTL6dSwBDuZOy0uRl9x4nFTeDvG N4x8F4Xm4RbCivUUHqmJvJJVZdQyggg7LVpBJbdyxzsXmtpjOKSMd6Yup9XwACUGGeTB Vshe669JAP26GxgxhWatSFgD70nHLICteyQd0i147l3+IHpeHEn7TXyBhOS8eA/NZdSv Rk2w== 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 k10si8644827wrg.550.2017.09.12.17.48.02; Tue, 12 Sep 2017 17:48:03 -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 08B94689DE0; Wed, 13 Sep 2017 03:47:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08E036805E8 for ; Wed, 13 Sep 2017 03:47:49 +0300 (EEST) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 08874C5A54 for ; Wed, 13 Sep 2017 02:47:53 +0200 (CEST) Date: Wed, 13 Sep 2017 02:46:00 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170913004600.GA7094@nb4> References: <20170912012508.139701-1-tfoucu@gmail.com> MIME-Version: 1.0 In-Reply-To: <20170912012508.139701-1-tfoucu@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] vf_fps: when reading EOF, using current_pts to duplicate the last frame if needed. 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" On Mon, Sep 11, 2017 at 06:25:08PM -0700, Thierry Foucu wrote: > Fix ticket #2674 > Tested with examples from ticket 2674. > --- > > Update the Patch with the correct number of duplicate showing. > For exmaple, in case we up-sample one second video at 24fps by 2, we should be getting 24 duplicate frames. > > ffmpeg -loglevel verbose -i 24fps.avi -vf fps=48 -f null - > ffmpeg version N-87234-g9a32769f5e Copyright (c) 2000-2017 the FFmpeg developers > built with gcc 4.8 (Ubuntu 4.8.4-2ubuntu1~14.04.3) > configuration: > libavutil 55. 74.100 / 55. 74.100 > libavcodec 57.105.100 / 57.105.100 > libavformat 57. 81.100 / 57. 81.100 > libavdevice 57. 8.100 / 57. 8.100 > libavfilter 6.103.100 / 6.103.100 > libswscale 4. 7.103 / 4. 7.103 > libswresample 2. 8.100 / 2. 8.100 > Input #0, avi, from '24fps.avi': > Metadata: > encoder : Lavf57.81.100 > Duration: 00:00:01.00, start: 0.000000, bitrate: 368 kb/s > Stream #0:0: Video: mpeg4 (Simple Profile), 1 reference frame (FMP4 / 0x34504D46), yuv420p(left), 320x240 [SAR 1:1 DAR 4:3], 24 fps, 24 tbr, 24 tbn, 24 tbc > Stream mapping: > Stream #0:0 -> #0:0 (mpeg4 (native) -> wrapped_avframe (native)) > Press [q] to stop, [?] for help > [Parsed_fps_0 @ 0x25ea6a0] fps=48/1 > [graph 0 input from stream 0:0 @ 0x275cc00] w:320 h:240 pixfmt:yuv420p tb:1/24 fr:24/1 sar:1/1 sws_param:flags=2 > Output #0, null, to 'pipe:': > Metadata: > encoder : Lavf57.81.100 > Stream #0:0: Video: wrapped_avframe, 1 reference frame, yuv420p(left), 320x240 [SAR 1:1 DAR 4:3], q=2-31, 200 kb/s, 48 fps, 48 tbn, 48 tbc > Metadata: > encoder : Lavc57.105.100 wrapped_avframe > No more output streams to write to, finishing. > frame= 48 fps=0.0 q=-0.0 Lsize=N/A time=00:00:01.00 bitrate=N/A speed=99.3x > video:25kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown > Input file #0 (24fps.avi): > Input stream #0:0 (video): 24 packets read (39693 bytes); 24 frames decoded; > Total: 24 packets (39693 bytes) demuxed > Output file #0 (pipe:): > Output stream #0:0 (video): 48 frames encoded; 48 packets muxed (25344 bytes); > Total: 48 packets (25344 bytes) muxed > [Parsed_fps_0 @ 0x25ea6a0] 24 frames in, 48 frames out; 0 frames dropped, 24 frames duplicated. > > libavfilter/vf_fps.c | 44 +++++++++++++++++++++++++++++++++++++++----- > tests/ref/fate/filter-fps | 6 ++++++ > tests/ref/fate/filter-fps-r | 4 ++++ > tests/ref/fate/m4v-cfr | 1 - > 4 files changed, 49 insertions(+), 6 deletions(-) this breaks "make fate" Test filter-mpdecimate failed. Look at tests/data/fate/filter-mpdecimate.err for details. make: *** [fate-filter-mpdecimate] Error 1 make: *** Waiting for unfinished jobs.... [...] --- ./tests/ref/fate/filter-mpdecimate 2017-09-13 02:17:33.572000292 +0200 +++ tests/data/fate/filter-mpdecimate 2017-09-13 02:33:35.508011763 +0200 @@ -22,4 +22,3 @@ 0, 24, 24, 1, 115200, 0x056d40ca 0, 26, 26, 1, 115200, 0xa4374737 0, 27, 27, 1, 115200, 0x3eaa3ae8 -0, 29, 29, 1, 115200, 0x7551e9ee