avformat/mov: add interleaved_read option

For badly interleaved files, interleave packets from 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.

Zhao Zhili committed 3 years ago

Commit a8d9da41 parent 6434e444 files · +13 −2Browse files

Showing the changes to libavformat (3 of 4 files). Show all

Unified · Split

3 files

libavformat/isom.h +1 −0
libavformat/mov.c +4 −1
libavformat/version.h +1 −1

libavformat/isom.h+1−0

@@ -327,6 +327,7 @@ typedef struct MOVContext { · 326 unmodified lines
327	int64_t extent_offset;	327	int64_t extent_offset;
328	} *avif_info;	328	} *avif_info;
329	int avif_info_size;	329	int avif_info_size;
		330	int interleaved_read;
330	} MOVContext;	331	} MOVContext;
331		332
332	int ff_mp4_read_descr_len(AVIOContext *pb);	333	int ff_mp4_read_descr_len(AVIOContext *pb);

libavformat/mov.c+4−1

     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);
             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) ||
     { "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", "Interleave packets from multiple tracks at demuxer level", OFFSET(interleaved_read), AV_OPT_TYPE_BOOL, {.i64 = 1 }, 0, 1, .flags = AV_OPT_FLAG_DECODING_PARAM },
     { NULL },
 };

libavformat/version.h+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFORMAT_VERSION_MINOR 12	34	#define LIBAVFORMAT_VERSION_MINOR 12
35	#define LIBAVFORMAT_VERSION_MICRO 100	35	#define LIBAVFORMAT_VERSION_MICRO 101
36		36
37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38	LIBAVFORMAT_VERSION_MINOR, \	38	LIBAVFORMAT_VERSION_MINOR, \

avformat/mov: add interleaved_read option

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code