From patchwork Sun Jan 17 01:48:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 24992 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 3292844B055 for ; Sun, 17 Jan 2021 03:48:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0957B680795; Sun, 17 Jan 2021 03:48:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C6416802C5 for ; Sun, 17 Jan 2021 03:48:50 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id e9so2525300plh.3 for ; Sat, 16 Jan 2021 17:48:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=l2Qi25DLxn/ELxyCAQfyEgqW6DOglZS8qTm6RvTXaKA=; b=tACHGXS1Wx/D2XxEMegxXrWO+jXu45VDKqtKoYOaSqAhBlGlFZGM7tQe7ROtGaE0bx wctFU1YuPF52KLd25ZPaQOhofoaD20ew8jufGDCi6/Jghq2A5LtT5zk6riut1EvXdICj Gz2jQjqAjNteZKNfc2kZJ2Tx6UFox2+zFn+/wlWEqp6+sDihW8btpJqcdCmH3Ra47w3A HJLD+Jya+c36vrOWhM+rwpJ1d32WkMcJV+kYB2QG736Jqc9wcHuJYaTduIKq7wERLulj OS5Hv00xLI3TwL7bvyvaBD3SmGUDii4osRnnjzq7gcRccYO0x6goitMV1wGLtvjwaCmk BnKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=l2Qi25DLxn/ELxyCAQfyEgqW6DOglZS8qTm6RvTXaKA=; b=WkSS7uQrx/g5KCtiV4FAb6bHwcntTQi70S/WYesjRSwQJgV5eTIgX1ve6SHDtd3T0F YTtoQ1zXmYSFAfabXPaEEl0IvGSqAqvrdsBGsU9aaMRepcQGFFyhlXnjmCYp+ndEnx7N +RiKtlcGbIh6I4Dav4vvn423jsIHZbx9f8/PMuYIJWLkkOBl4LR53CFN+UlxGXBeb23O 8oGycuKumyBlF4U0mCJaz4ESgNUxQF9JD3Im4zQDJmruMaylBzSeSIWQjaSEM12xkWGh hwdwZ1TFwEq1/SByIy9y7dpvUM+V8/3+/fCpCl5XUQOYsS9ol1GtvO5U88fVTtiZsQ6J /W/A== X-Gm-Message-State: AOAM5324aJIhunhp/n4X5La8RkbZwyBEmhDquyJ7x5Vwy3AuaejJ7xmA v3r0wyzFDA/QpZxvGKvHtnGlDodulaY= X-Google-Smtp-Source: ABdhPJy3s20+l2xN0lQfXm4qJRwpDim8B/byjtA2RIWUPgqoIlYO1CRD2A4MoDfPMmDxDSvmMJtqTA== X-Received: by 2002:a17:90a:7844:: with SMTP id y4mr18596956pjl.68.1610848128074; Sat, 16 Jan 2021 17:48:48 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id b188sm8152025pfg.68.2021.01.16.17.48.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Jan 2021 17:48:47 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Jan 2021 17:48:45 -0800 Message-Id: <20210117014845.81268-1-mindmark@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mov: fix timecode with counter mode flag set 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 Cc: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mark Reid The current behaviour ends up squaring the avg_frame_rate if the conter mode flag is set. This messes up the timecode calculation, and looks to me as a regression that seems to have been introduced 428b4aac. Upon further testing is seems that no special case is need for having the counter flag set. av_timecode_init appears to handles the timecode correctly, at least in the sample files I have. Here is a sample mov file with the counter flag set https://www.dropbox.com/s/5l4fucb9lhq523s/timecode_counter_mode.mov before the patch ffmpeg will report the timecode as: 00:37:11:97 and warns that the timecode framerate is 576000000/1002001 after patch: 14:50:55:02 --- libavformat/mov.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3215b53636..f8856a43dd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2350,19 +2350,6 @@ FF_DISABLE_DEPRECATION_WARNINGS st->codec->time_base = av_inv_q(st->avg_frame_rate); FF_ENABLE_DEPRECATION_WARNINGS #endif - /* adjust for per frame dur in counter mode */ - if (tmcd_ctx->tmcd_flags & 0x0008) { - int timescale = AV_RB32(st->codecpar->extradata + 8); - int framedur = AV_RB32(st->codecpar->extradata + 12); - st->avg_frame_rate.num *= timescale; - st->avg_frame_rate.den *= framedur; -#if FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - st->codec->time_base.den *= timescale; - st->codec->time_base.num *= framedur; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - } if (size > 30) { uint32_t len = AV_RB32(st->codecpar->extradata + 18); /* name atom length */ uint32_t format = AV_RB32(st->codecpar->extradata + 22);