From patchwork Sat Dec 25 09:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 32913 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8784972iog; Sat, 25 Dec 2021 01:41:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJyv2rgQDA9Fnj7xXyolxfoUE112WWPzIrjHyOT/iU7yFFvlMkOIiiD3hJCfgkiowadnjSyH X-Received: by 2002:a17:907:7f8c:: with SMTP id qk12mr7637461ejc.169.1640425266237; Sat, 25 Dec 2021 01:41:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640425266; cv=none; d=google.com; s=arc-20160816; b=EOKAEH890R8C7GjDatRW5XLx1fh4LVDODIqIxMp0BDMgrOSo+2jtnP4rT/zPWj7U7M YqQCyloTSMh0J0Uc65bEnFvUjbSS7NnVQGkyJRy5xvHlxvR8PWUzveeisyUkcfjb3YIq 5JbgjmU+i4BXSryWd14zYqr8Nsfw9D1ECQd/4K+gaLHDuBnaQeGIG6za9GhMQv9Gi4G8 T81tE23qthGydNoDZmyAt+oAXIPE/FAHb5RRiWgT+oxV3YIkyPPM/OCQDwB83ApYnmEg eibGjnYwIXWOKqCdsj5u9rDA6UUUE18JFrEL+Za0mkwb9FIo4bF5iYglikIVaCx/uCBe Ju/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=PuNQvPoaWXGC7Ec8qjT1tIFIDe9vVSWpJyh4TkGRJWk=; b=r/WQ/3Df4OHXHPwcdzU8V18GmlFeRcjmllPxKNJyaQ9QED9UKgIG/QvHXFvilGC6Mm 9Ge/AlXC5UzZIwCIEQ9/pL0ovDLVJ0YJFry8ksjOmYV2kg0WFiMgZ4+P5gSmJt4sWv5m +vCMS8Oz+MW3PjCMKrHc3QztR8cBWSVue6W/fna39w428c8+EmtjFMJC5GzlEOphLVcS u8VspMXGSQb8Af0hemBq3hUzL2tXcwbGXBo/cLwyNHNlU0PlCbIfzu+BwQucH/RMnjuc fC2pYaWNSIpR2DFBSQc1HCCELWHnWfXROzJF74hbEJ5ut3u3jJk+CxTwEtFmWr9cYfeF Zrgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="zK3/8tQ3"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qw12si5264887ejc.929.2021.12.25.01.41.05; Sat, 25 Dec 2021 01:41:06 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b="zK3/8tQ3"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAFFD68B0FD; Sat, 25 Dec 2021 11:41:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 531BA68B0F3 for ; Sat, 25 Dec 2021 11:40:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640425253; bh=l59SOMsl3HyigkUsGHi+4QYhhgine/R2Zpa2YQdy3Vk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zK3/8tQ3MIrO68oQWBhHLw0vzSB0Q0W221h0reG97UCwXNzsv/bSdH3HdLG9F2+5z jDCZbtigUjH2BmrDAT/zrJn7SWtaw5gZ5aU7H0H8KTls2pAQC71NkE3tWV4PQrxc2n Nc7xTH2AWfG5A7ciJx0BJITjVidHbYdrR7gXh510= Received: from ZHILIZHAO-MB2.tencent.com ([113.87.131.148]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id A33ABE63; Sat, 25 Dec 2021 17:40:51 +0800 X-QQ-mid: xmsmtpt1640425251tnnhfgq6m Message-ID: X-QQ-XMAILINFO: NUK7nd1wVvrCxxB5GK1vekZsjfRwp3bOJYhpMIcLnZ1hrb5B6m35v0kf86LuW6 eq/2P/z5Ir7X7ea/vdJ7TSUdNS7enD3ij2Ng1BamJ12+uP9TfOwtqjBFe0pbHxR3TgyX6EFc9NCB G8JTohzJ5eTU9lEAwjyt6WB31fnmfXj+hziyOG4iasGctUpQ2zx7XRzNi/MCFM5Vk27MaUFsCW/p 1CgjlXdRHX14KeoiKW8+zEI1LcPnrWXtmLB7iZPQYtP6Is1fazFb/dGNB2NGLkV4I7z8K0JPG0Gh 86eJ2fu663WT5BLaQUMLh+2kn5WzdMSvzvQsIhUIjQT/vA5q9Q869Izk2nEC8f809YGQBySAVIfQ 6A3sZ7aM506LLFbwQ5XVF+rpgtR4xy4HU4ec5vbV9bWZAxYyW30NyUhRrwnZcDxTweB8MYPVvuej LZQVdxKc0lqGRbjTnjWvI7XcoU+hFmIagEEgqhsaGfGJVp4MGqPaEf8Cj8J+RYyg6heDfIycqC1s 6q4o/G2yo4bLz+s8KY98nplgr/Wxf5z626Th73NPwGZceOBUd6nP3BHYf/733O2dQ4DY73PCqHAQ N7HZ2fL4z7ZxF2FEm+kiHzia4kJ0pey52CDNHjPFLVBoOMeu4/0k+If0xCTLSMTACuMiTBzwwhQt lvAuy/kq/QitaTQgyYfHfxck/j1jt9amRfitFl/YBh07uluDs3s7EUvVsZLjBqukrfn+OSmYIiUG BFMw69EWc9yGedHtAM6XIw8yV97KbidFr4Ot/RP+BzwzIp/JAJ06eXo2TydgD5tYXuXRcCgsQWIX Tl+3hsR0J5sLu48XQER1rKn/WbhCPYEhFFpEB1YOiBc4THp9VK5I3IdYikjBV1r/6C9Za5ML5hmw == From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 17:40:50 +0800 X-OQ-MSGID: <20211225094050.57273-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] avformat/mov: add use_hoov option 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HZVUgFERYKQW Fix #8883. --- doc/demuxers.texi | 6 ++++++ libavformat/isom.h | 1 + libavformat/mov.c | 9 +++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index cab8a7072c..276b536ac5 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -713,6 +713,12 @@ specify. @item decryption_key 16-byte key, in hex, to decrypt files encrypted using ISO Common Encryption (CENC/AES-128 CTR; ISO/IEC 23001-7). + +@item use_hoov +Whether to use hoov atom as moov atom to support some broken files. Set it to 0 for disable, 1 for enable, +-1 for automatic, which means take hoov as moov in the second pass if moov doesn't been found in the first +pass. + @end table @subsection Audible AAX diff --git a/libavformat/isom.h b/libavformat/isom.h index ef8f19b18c..7c837811a6 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -305,6 +305,7 @@ typedef struct MOVContext { int32_t movie_display_matrix[3][3]; ///< display matrix from mvhd int have_read_mfra_size; uint32_t mfra_size; + int use_hoov; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index ea2f010aa0..82237f930b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7325,7 +7325,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) a.size = avio_rb32(pb); a.type = avio_rl32(pb); if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || - a.type == MKTAG('h','o','o','v')) && + a.type == MKTAG('h','o','o','v') && c->use_hoov == 1) && a.size >= 8 && c->fc->strict_std_compliance < FF_COMPLIANCE_STRICT) { uint32_t type; @@ -7951,8 +7951,12 @@ static int mov_read_header(AVFormatContext *s) /* check MOV header */ do { - if (mov->moov_retry) + if (mov->moov_retry) { avio_seek(pb, 0, SEEK_SET); + /* reset use_hoov from auto mode to force mode in second pass */ + if (mov->use_hoov == -1) + mov->use_hoov = 1; + } if ((err = mov_read_default(mov, pb, atom)) < 0) { av_log(s, AV_LOG_ERROR, "error reading header\n"); return err; @@ -8593,6 +8597,7 @@ static const AVOption mov_options[] = { { "decryption_key", "The media decryption key (hex)", OFFSET(decryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_DECODING_PARAM }, { "enable_drefs", "Enable external track support.", OFFSET(enable_drefs), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS }, + { "use_hoov", "Take hoov as moov atom, 0 for disable, -1 for auto, 1 means force", OFFSET(use_hoov), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, FLAGS }, { NULL }, };