From patchwork Sun Sep 10 05:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43673 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1440128pzb; Sat, 9 Sep 2023 22:51:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+IQPf4adyMI5/aLie95AnunA6uSNBiDH0xQgWxs5twHN/ODrZcBpLAgsbZZp9t/wgdhnJ X-Received: by 2002:a17:906:5dae:b0:9a1:680e:8c54 with SMTP id n14-20020a1709065dae00b009a1680e8c54mr5393775ejv.71.1694325094954; Sat, 09 Sep 2023 22:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694325094; cv=none; d=google.com; s=arc-20160816; b=yV8C1a+bSddZk2LUGvytA6jWQ1LbtyX5pUBt4Xhs8fiQKGo801Zw/S9MJGFTbJFK/9 +Pgufjn+zjKqosnHFakUYjcx3TvKqj+c65MIteuxYm1rW1POgCw8ezWTVzQ8h3MgvlcJ rvTTCSpr1vom93BgrUyrd+CeAaLketsQzyRSn626N7ZD6ugMaPh7JYxbISzavQjqgfNo D+S7fTMas/AgaaUqeSVkKjZMSyD0d5gIg5NeafYKEJQ9XtBWICPupvOEY4T4dpAjlrZk 9oWBErOfbVbKnHKPKpm9S9Y6Dn4U3oArCg9ga6wJpI/nFFRzB7duv2Y4ndOHAi0ZKyKV Bf6A== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=R3pkcr13NCpcjAxL8E6Ry5t/StKk/IouRuuDW2xsA3U=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=y/HVkYoKrHffCC5mK4N+Ge7eaPc74fwUv/1angPci/vmwJM40vgwuUwssnZH1uiA0m akIeJmubPsOHG/qyZ0MHCBg4z4mlJrDm/CP1xKGMMAkIxrGT022jLSAB+aixQLB3FA0i w0Z+3bST3125baIBkOcf1e0miGluXiS7BRqIgq3bFU5LpQ401NErx7VSKckTSPxAyCl1 ZNz3btpOlgG/aBgv/cgvEkUfQMPKnO24afp4pyry/de91EbqExyKgcO0kMmFnIKFTMtv FEWBb6dlZQ5NzztyuyKCfrEZ5okaGxvdFjl+Eyg5FrzfIHQnf6zv1YhO0yUlzRSu7yfJ BzwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=bRzjzLRq; 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 x20-20020a170906711400b00992ad2f72fesi3920274ejj.537.2023.09.09.22.51.34; Sat, 09 Sep 2023 22:51:34 -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=@foxmail.com header.s=s201512 header.b=bRzjzLRq; 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 C3C3D68C690; Sun, 10 Sep 2023 08:51:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-59.mail.qq.com (out203-205-251-59.mail.qq.com [203.205.251.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 594BF68C782 for ; Sun, 10 Sep 2023 08:51:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1694325071; bh=kMXDczSBGtujVMkpKrDqRPFPv8R1otP7swN5h4ZCqTo=; h=From:To:Cc:Subject:Date; b=bRzjzLRq4An0QEZr/USi8KxmYjIL7HbLVxgcSrwSxhx00J9h8Ycx49rsmedKa+MaQ 1hu+T372RgOC6Az7txyRVvq753bWNN3Rf/o8hgVNYchHjFuVewl+4GBMM768w3H8X+ EEFf1z6LBQw9VBAoObly/jMguAybYQVMvJIPHPtA= Received: from localhost.localdomain ([121.35.187.136]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id CC9B986A; Sun, 10 Sep 2023 13:51:09 +0800 X-QQ-mid: xmsmtpt1694325069t7f3oep7k Message-ID: X-QQ-XMAILINFO: N4ySfEzOscB6lnLFtaghn0kJ+weoejXBLT+MyTNGENJRJ2PjENci2GMJHoDbQs vBUSHzWHTvHILY052i+aZCXX1ExrxYA7MIxlQnOBQPi0oJTdPwHqunhIYh6ceP80JpMnsVdbb9WP u5wscyv5pFWrQDrgFdr/1ncjL20CTAR7kKblu/4HWZMs7rFgngnJHpvLDM6nfFkJOyeKHE5US4WD uespCoYywI8Pm6ODOxSRhve53qcpxjrkBcGS61b192/eNrccVFafQieapZPmafkQh+E3URPTbiwj JHOtFAKICaCGie42097R1ThsCMQ5GaoS7agJJ4ZAYLQCEhKyu8InaIPdzwfWqBaipV6BqdTQefRV ZH7zQznnQVz8RdKDTxJ+VrRSByMgwDzQ0k5Fn4D/BM3f0lg8SxuhDr+c6VWwzNr3DsKjICGAnQW8 VxCH5Dd+VgwUUsX3o/+Qjg1WI4c7AEelUvdk4Qsp8vYbK9J6RlXXXZn6+KZjJsNDQUBKZHvm7/8K P5iAUeWymZ6J7ynmKd9OdebFJFbWCZ1fb3aGTpXcb6k0Ax2BFD0QA4nP2aFgNlG9BorSV5ACNve5 pBzzLjaPwFoIJW0ejXQJAk+1q5BStWoLUHD5kOTR9RFZxuP+UnUPN0LSWTqb4i4dZ0hM9PDg2xwo UzEbXGJ2uOJsEEfeu/GJ0tkjHp5BZohOzLziOfo/Z16LweoWLro6/Bbck2scYm3/RpgceQ8X/87h hbrhh3IhLpryCC01jfK8k6XwGfKQuhvNE10uz0S9xb0tdty9GtrhiNcJNotvZHVAAfO0f1yL2c1r go9kRLU4VEnOdTwmRncJjlmx2yHMqdxEj8OGF0oABZAPD4DkNPfpNWZ4zLfNOSv/FtLADBD8C2hO hUGUeJ/gjG63QXbgc81eJVuN2vIbvNlzDowukVyhAL/LCwDXW01VZLfRmzxOGesu/jRhGFJicwOs 2UxqocHNc046Yp/BSnMvv6aG0AP7b4gpYTtJtNV+g= X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 13:51:06 +0800 X-OQ-MSGID: <20230910055106.221821-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mov: add interleaved_read 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: EJUpv/SPhI+f From: Zhao Zhili For bad interleaved files, manually interleave multiple tracks at the demuxer level can trigger seeking back and forth, which can be dramatically slow depending on the protocol. Demuxer level interleave can be useless sometimes, e.g., reading mp4 via http and then transcoding/remux to DASH. Disable this option when you don't need the demuxer level interleave, and want to avoid the IO penalizes. This issue is well known. Two samples can be found at here http://ffmpeg.org/pipermail/ffmpeg-devel/2022-December/304951.html Signed-off-by: Zhao Zhili --- doc/demuxers.texi | 6 ++++++ libavformat/isom.h | 1 + libavformat/mov.c | 5 ++++- libavformat/version.h | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 2d33b47a56..1b65332224 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -779,6 +779,12 @@ cast to int32 are used to adjust onward dts. Unit is the track time scale. Range is 0 to UINT_MAX. Default is @code{UINT_MAX - 48000*10} which allows upto a 10 second dts correction for 48 kHz audio streams while accommodating 99.9% of @code{uint32} range. + +@item interleaved_read +Interleaved read between multiple tracks, enabled by default. For bad interleaved files, manually interleave multiple +tracks at the demuxer level can trigger seeking back and forth, which can be dramatically slow depending on the +protocol. Disable this option when you don't need the demuxer level interleave, and want to avoid the IO penalizes. + @end table @subsection Audible AAX diff --git a/libavformat/isom.h b/libavformat/isom.h index 4b1cd42f0f..3d375d7a46 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -327,6 +327,7 @@ typedef struct MOVContext { int64_t extent_offset; } *avif_info; int avif_info_size; + int interleaved_read; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index aa1d9e4ccc..8ad5f0b646 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8780,6 +8780,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) AVIndexEntry *sample = NULL; int64_t best_dts = INT64_MAX; int i; + MOVContext *mov = s->priv_data; + int no_interleave = !mov->interleaved_read || !(s->pb->seekable & AVIO_SEEKABLE_NORMAL); for (i = 0; i < s->nb_streams; i++) { AVStream *avst = s->streams[i]; FFStream *const avsti = ffstream(avst); @@ -8788,7 +8790,7 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) AVIndexEntry *current_sample = &avsti->index_entries[msc->current_sample]; int64_t dts = av_rescale(current_sample->timestamp, AV_TIME_BASE, msc->time_scale); av_log(s, AV_LOG_TRACE, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts); - if (!sample || (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && current_sample->pos < sample->pos) || + if (!sample || (no_interleave && current_sample->pos < sample->pos) || ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && dts != AV_NOPTS_VALUE && ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) || @@ -9282,6 +9284,7 @@ static const AVOption mov_options[] = { { "enable_drefs", "Enable external track support.", OFFSET(enable_drefs), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS }, { "max_stts_delta", "treat offsets above this value as invalid", OFFSET(max_stts_delta), AV_OPT_TYPE_INT, {.i64 = UINT_MAX-48000*10 }, 0, UINT_MAX, .flags = AV_OPT_FLAG_DECODING_PARAM }, + { "interleaved_read", "Manually interleave between multiple tracks", OFFSET(interleaved_read), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, .flags = AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 1055753772..695e17ed7f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 11 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \