From patchwork Thu Apr 20 14:36:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 41280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp554042pzb; Thu, 20 Apr 2023 07:37:21 -0700 (PDT) X-Google-Smtp-Source: AKy350Zmi1jD35RAfFgyQQrVtHzV/lGR+gEGwoZN+hJTAueQwID3KFJ0MFMdh/GnA95WrEgBPJed X-Received: by 2002:aa7:d949:0:b0:506:bce0:48d6 with SMTP id l9-20020aa7d949000000b00506bce048d6mr1922627eds.5.1682001441075; Thu, 20 Apr 2023 07:37:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682001441; cv=none; d=google.com; s=arc-20160816; b=pIyLa+BuNiTArtUcSTx18YnAWsZbhfjO1hr62E4wb6mZQ1o/FOpC5pf0UsLLoHYOKQ XpSjiDmyD1kPYmQ/1jNzwFgM4aiwQZbOfb/UQb43mWuLlRy1wfMmZNO9FlxyCAaIPda3 2kwkdlFqGwnFiMcw6319w60EBxzsEbU68a3a41+y2qFT+9pQiXzgK3UFaxByg6F1Lt1A Mgz+2e8ZvJsvYRTceRMvhMoelRNkRr8Z0JSMLe06pBI0vHgT17TKobtMIgjrMKHtTbdB pQL70vtJIG1TjJtQU8H4yu8+8eYV03pj3Ywd1vyUCLk4KVtVEdZXSXRrcsLqb7ZIW3Pe tbkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=DyOyqBEpI67Kr8a2O462a1C0dPjRzJX09dLeBk84dDE=; b=JYf4upuUo/DV59AeM00PO2cbvI7CeoSw/5fs4TiQXbcMb0+wxo2ncYjDsXTrF6hLnL vVfc2czOKXuqKqPeLb4wFjRrBHTO51TdCaygnK4n0k260jrwkVqopFpeGvwrBDsL7flW 09KUA/3+xH+BOKKHmhOjGbETGO8lAft6Rm3vGBbkE6ikO6C4riGXJaZR9FJnfbM0p9CS +bcwFvjWR9Na16DpN1wf5r71YfapUxun3PschfUsv3W+zxa5cHNzKdevU3b75HahBcfb IJ9axmsikmm9LPEHrNnwooC6D1vGIvTZAUHeAYeW+tDPsKxVZsgN1vds0VA6vX/+yInl ajpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="oO97Rlf/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d14-20020aa7d68e000000b005067c8073casi1802207edr.135.2023.04.20.07.37.20; Thu, 20 Apr 2023 07:37:21 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="oO97Rlf/"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E968368BE1B; Thu, 20 Apr 2023 17:37:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2630068BE1B for ; Thu, 20 Apr 2023 17:37:10 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-2f7a7f9667bso419774f8f.1 for ; Thu, 20 Apr 2023 07:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682001429; x=1684593429; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=JlPLPUm5biZBAtzW1MKnVnXSoVyZXlLWNAQu9tN5wUs=; b=oO97Rlf/I69MxcLNSP1MuTkwAvzBkTctEFzIqw0RVta9vGv4MNF3PQ/QOMK0FXdRrd FCdpISFJcKu4iKgI1DPkSp6n9BqgOAUwStwJYjcd7QcGs8afCTyG3MwoyD/1mKds6hpG uKVj0o21T4hUM8H7WO384DL89Q1c1mcBAKm6QTDIb0lJbe8gsPdMM2J8LoMWM4yArev8 SC/lOk4O5DD3Qs6JQNFLg+x7eION8QmjdQ6OQaQJXBEaDWDv7qCWNxsBsdQrnOm1Mh4Q yOHL5EnbaQB7eWyNNPqjFAycJ8MhELHUqYCLxEEiq1Pxndv85/OvX5Wd5KWOvBuLbnDF mwKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682001429; x=1684593429; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JlPLPUm5biZBAtzW1MKnVnXSoVyZXlLWNAQu9tN5wUs=; b=Du3oytPXWgaMxrqBOKTkOvNr5xyUlMZwqUeK6cR3I+WmmOHLhw4dxBQhyBokQg08fp pimRu74StyZ/Gy3rua4a/4dF5nWuJE8rPTKhQ0tpikGl6OLoeSlMJEsdHq66L4BQ0TuN GYDkqrvPHa6o9yF/nBU2mAp4hzN8C4KsOGZCxpz3NKo3xiAU9bqcZBON1enDA80OwImb gd+3RAm3MWYAghNOEoC6y5foo6Vu8blTy8c/alSFXW3EaeKG45YRLMdxLsm6l07FBNXT 2k1aTOvkXWb7AVoF+kOQf0+Pl6s1HabCBskMtcbWVFXXyZav4FkIfyrb9t1mzz7bNdsN F6yA== X-Gm-Message-State: AAQBX9eRu+OnZxu9mChvRoI8uGAItihWCx18czAeW9u60r+zri6oPrn4 kav9KY5OoPEPiEF2xbD+icDXomRpo8M= X-Received: by 2002:a5d:5389:0:b0:2fa:1c3b:ca51 with SMTP id d9-20020a5d5389000000b002fa1c3bca51mr1501584wrv.71.1682001428734; Thu, 20 Apr 2023 07:37:08 -0700 (PDT) Received: from localhost.localdomain (33bf137a.skybroadband.com. [51.191.19.122]) by smtp.gmail.com with ESMTPSA id b1-20020a5d45c1000000b002fdeafcb132sm2077656wrs.107.2023.04.20.07.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 07:37:08 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 15:36:56 +0100 Message-Id: <20230420143656.421028-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] mov: Do not blindly disable advanced edit lists if use_mfra_for is set 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bBJA25/wjvHt This was a bug/mistake in dae3679a9bfa421829ef9049ae2167089a2fdef7. use_mfra_for by defintion only has an effect on fragmented MP4 files, making the check not only redundant, but also broken if a user used the option globally (i.e. set on non-fragmented MP4s). Signed-off-by: Derek Buitenhuis --- libavformat/mov.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 057fd872b1..4f38f7cb78 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4655,12 +4655,8 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) * Advanced edit list support does not work with fragemented MP4s, which * have stsc, stsz, stco, and stts with zero entries in the moov atom. * In these files, trun atoms may be streamed in. - * - * It cannot be used with use_mfra_for = {pts,dts} either, as the index - * is not complete, but filled in as more trun atoms are read, as well. */ - if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO && - c->advanced_editlist) { + if (!sc->stts_count && c->advanced_editlist) { av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " "MP4. disabling.\n");