From patchwork Wed Mar 22 03:08:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3058 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp121013vsy; Tue, 21 Mar 2017 20:09:02 -0700 (PDT) X-Received: by 10.223.169.161 with SMTP id b30mr34530208wrd.196.1490152142804; Tue, 21 Mar 2017 20:09:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 63si545197wmv.111.2017.03.21.20.09.02; Tue, 21 Mar 2017 20:09:02 -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 9BED1688386; Wed, 22 Mar 2017 05:08:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F28CE688363 for ; Wed, 22 Mar 2017 05:08:34 +0200 (EET) Received: from mfilter18-d.gandi.net (mfilter18-d.gandi.net [217.70.178.146]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 581BA41C080 for ; Wed, 22 Mar 2017 04:08:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter18-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter18-d.gandi.net (mfilter18-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Jyl76oNFaYT7 for ; Wed, 22 Mar 2017 04:08:52 +0100 (CET) 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 relay5-d.mail.gandi.net (Postfix) with ESMTPSA id D655B41C08A for ; Wed, 22 Mar 2017 04:08:51 +0100 (CET) Date: Wed, 22 Mar 2017 04:08:49 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170322030849.GK4714@nb4> References: <465241691.1432459.1490138721403.ref@mail.yahoo.com> <465241691.1432459.1490138721403@mail.yahoo.com> MIME-Version: 1.0 In-Reply-To: <465241691.1432459.1490138721403@mail.yahoo.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] avfilter/vf_fps: fix duration 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 Tue, Mar 21, 2017 at 11:25:21PM +0000, Thomas Mundt wrote: > Hi, > > attached patch will fix ticket #2674. > It makes the fps filter duplicate or drop the last frame depending on the input and output frame rates. > Tested with examples from ticket 2674 and other files at various frame rates. > > Regards, > Thomas > vf_fps.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > 01d220968700e58b1bd772fbf63dee55d29955f6 0001-avfilter-vf_fps-fix-duration.patch > From 6724eb3dae7b491d5bac3903cf4b7dc4ff037e6c Mon Sep 17 00:00:00 2001 > From: Thomas Mundt > Date: Wed, 22 Mar 2017 00:14:53 +0100 > Subject: [PATCH] avfilter/vf_fps: fix duration > > Fix Ticket #2674 > This makes the fps filter duplicate or drop the last frame depending on the input and output frame rates. Tested with examples from ticket 2674 and other files at various frame rates. > > Signed-off-by: Thomas Mundt > --- > libavfilter/vf_fps.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) breaks fate Test m4v-cfr failed. Look at tests/data/fate/m4v-cfr.err for details. make: *** [fate-m4v-cfr] Error 1 make: *** Waiting for unfinished jobs.... [...] --- ./tests/ref/fate/m4v-cfr 2017-03-20 19:25:54.157895388 +0100 +++ tests/data/fate/m4v-cfr 2017-03-22 04:06:23.690852041 +0100 @@ -44,4 +44,3 @@ 0, 38, 38, 1, 115200, 0xf30825d5 0, 39, 39, 1, 115200, 0xe3c944a1 0, 40, 40, 1, 115200, 0x8fec4420 -0, 41, 41, 1, 115200, 0x9381fdab