From patchwork Sun Aug 25 16:53:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14707 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DF9AE44A076 for ; Sun, 25 Aug 2019 19:53:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B48C968AC66; Sun, 25 Aug 2019 19:53:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay12.mail.gandi.net (relay12.mail.gandi.net [217.70.178.232]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E94D568AC1D for ; Sun, 25 Aug 2019 19:53:21 +0300 (EEST) Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 020F2200006 for ; Sun, 25 Aug 2019 16:53:20 +0000 (UTC) Date: Sun, 25 Aug 2019 18:53:20 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20190825165319.GE3219@michaelspb> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: improve timecode calculation 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 Fri, Aug 23, 2019 at 06:01:32PM +0200, Paul B Mahol wrote: > Here is patch. > > On Thu, Aug 22, 2019 at 6:18 PM Paul B Mahol wrote: > > > Hi, > > > > patch attached. > > > mov.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > 1f2e91bc38bd8e3f96e61076d79dac73e7d30390 0001-avformat-mov-improve-timecode-calculation.patch > From 881fcc40aad27d646a9b5866569ed8ca0e78777b Mon Sep 17 00:00:00 2001 > From: Paul B Mahol > Date: Thu, 22 Aug 2019 18:14:15 +0200 > Subject: [PATCH] avformat/mov: improve timecode calculation > > Fixes timecode calculation for NTSC frame rates. > Fixes ticket #5978. > --- > libavformat/mov.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index 24de5429d1..8fffc51fcb 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -2303,8 +2303,8 @@ static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, > int val; > val = AV_RB32(st->codecpar->extradata + 4); > tmcd_ctx->tmcd_flags = val; > - st->avg_frame_rate.num = st->codecpar->extradata[16]; /* number of frame */ > - st->avg_frame_rate.den = 1; > + st->avg_frame_rate.num = AV_RB32(st->codecpar->extradata + 8); /* timescale */ > + st->avg_frame_rate.den = AV_RB32(st->codecpar->extradata + 12); /* frameDuration */ > #if FF_API_LAVF_AVCTX > FF_DISABLE_DEPRECATION_WARNINGS > st->codec->time_base = av_inv_q(st->avg_frame_rate); breaks fate Test copy-trac236 failed. Look at tests/data/fate/copy-trac236.err for details. make: *** [fate-copy-trac236] Error 1 [...] --- ./tests/ref/fate/copy-trac236 2019-08-23 23:30:40.819525130 +0200 +++ tests/data/fate/copy-trac236 2019-08-25 18:50:46.578857135 +0200 @@ -1,4 +1,4 @@ -959a4d78c6c11936e361fc3101a013eb *tests/data/fate/copy-trac236.mov +984a33c6292e3d35e2cfdfbf66d8e82b *tests/data/fate/copy-trac236.mov 630860 tests/data/fate/copy-trac236.mov #tb 0: 100/2997 #media_type 0: video