diff options
| author | wm4 <wm4@nowhere> | 2015-02-27 12:44:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-27 12:44:40 +0100 |
| commit | b7bb0de1d96e4e55203cf9a646af5512102daa28 (patch) | |
| tree | 4b62765a72f419ee6e6d0f9032e65d0f7b281100 | |
| parent | d896f043e400451493db229da959ce1e8c3403bb (diff) | |
| download | mpv-b7bb0de1d96e4e55203cf9a646af5512102daa28.tar.bz2 mpv-b7bb0de1d96e4e55203cf9a646af5512102daa28.tar.xz | |
demux: bump default demuxer queue sizes
Now that we have fast stream switching, we can bump these sizes, as the
queues cause no delay in switching anymore.
Of course, the fast stream switching works for mkv and mp4 only. Other
formats will incur a quite terrible delay especially in network mode,
which this commit changes to 10 seconds. Let's see if someone
complains...
| -rw-r--r-- | DOCS/man/options.rst | 4 | ||||
| -rw-r--r-- | options/options.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index a9ab7e5c81..1018cf5f95 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2241,7 +2241,7 @@ Demuxer ``--demuxer-readahead-secs=<seconds>`` If ``--demuxer-thread`` is enabled, this controls how much the demuxer - should buffer ahead in seconds (default: 0.2). As long as no packet has + should buffer ahead in seconds (default: 1). As long as no packet has a timestamp difference higher than the readahead amount relative to the last packet returned to the decoder, the demuxer keeps reading. @@ -3138,7 +3138,7 @@ Cache ``--cache-secs=<seconds>`` How many seconds of audio/video to prefetch if the cache is active. This overrides the ``--demuxer-readahead-secs`` option if and only if the cache - is enabled and the value is larger. (Default: 2.) + is enabled and the value is larger. (Default: 10.) ``--cache-pause``, ``--no-cache-pause`` Whether the player should automatically pause when the cache runs low, diff --git a/options/options.c b/options/options.c index 1dd9eaffb2..cc79a2d941 100644 --- a/options/options.c +++ b/options/options.c @@ -737,11 +737,11 @@ const struct MPOpts mp_default_opts = { .demuxer_thread = 1, .demuxer_min_packs = 0, .demuxer_min_bytes = 0, - .demuxer_min_secs = 0.2, + .demuxer_min_secs = 1.0, .network_rtsp_transport = 2, .network_timeout = 0.0, .hls_bitrate = 2, - .demuxer_min_secs_cache = 2, + .demuxer_min_secs_cache = 10.0, .cache_pausing = 1, .chapterrange = {-1, -1}, .ab_loop = {MP_NOPTS_VALUE, MP_NOPTS_VALUE}, |