From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5333E42800 for ; Sun, 1 May 2022 12:12:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B727E68B2BB; Sun, 1 May 2022 15:12:09 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F42C68B234 for ; Sun, 1 May 2022 15:12:03 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9BF7AE7049; Sun, 1 May 2022 14:12:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P0n0BZnWMdd7; Sun, 1 May 2022 14:12:02 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 342A5E7048; Sun, 1 May 2022 14:12:02 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 May 2022 14:11:55 +0200 Message-Id: <20220501121155.21395-1-cus@passwd.hu> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: fix timecode with rounded down tmcd nb_frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Marton Balint Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Regression since 8dd5bb728038f21d17ec789e21d65fe8f3f364a6. Fixes ticket #5978. Signed-off-by: Marton Balint --- libavformat/mov.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0f63d997fc..dfd5720bf4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8038,12 +8038,13 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st) int64_t cur_pos = avio_tell(sc->pb); int64_t value; AVRational tc_rate = st->avg_frame_rate; + int tmcd_nb_frames = sc->tmcd_nb_frames; int rounded_tc_rate; if (!sti->nb_index_entries) return -1; - if (!tc_rate.num || !tc_rate.den || !sc->tmcd_nb_frames) + if (!tc_rate.num || !tc_rate.den || !tmcd_nb_frames) return -1; avio_seek(sc->pb, sti->index_entries->pos, SEEK_SET); @@ -8060,9 +8061,15 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st) * format). */ /* 60 fps content have tmcd_nb_frames set to 30 but tc_rate set to 60, so - * we multiply the frame number with the quotient. */ + * we multiply the frame number with the quotient. + * See tickets #9492, #9710. */ rounded_tc_rate = (tc_rate.num + tc_rate.den / 2) / tc_rate.den; - value = av_rescale(value, rounded_tc_rate, sc->tmcd_nb_frames); + /* Work around files where tmcd_nb_frames is rounded down from frame rate + * instead of up. See ticket #5978. */ + if (tmcd_nb_frames == tc_rate.num / tc_rate.den && + s->strict_std_compliance < FF_COMPLIANCE_STRICT) + tmcd_nb_frames = rounded_tc_rate; + value = av_rescale(value, rounded_tc_rate, tmcd_nb_frames); parse_timecode_in_framenum_format(s, st, value, flags); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".