From f1d0365a6f72b88f7427814f636863ae1656f72a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 6 Apr 2021 16:04:46 +0200 Subject: demux: undeprecate --cache-secs It serves a purpose and a rework of the cache won't be coming anytime soon. This partially reverts commit 8427292eb7c4074e1205c3d73c53c9e82569325f. --- DOCS/interface-changes.rst | 1 + DOCS/man/options.rst | 6 ------ demux/demux.c | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index ff7bf75c89..4a36041595 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -36,6 +36,7 @@ Interface changes `whole`. - add an additional optional `albumart` argument to the `video-add` command, which tells mpv to load the given video as album art. + - undeprecate `--cache-secs` option --- mpv 0.33.0 --- - add `--d3d11-exclusive-fs` flag to enable D3D11 exclusive fullscreen mode when the player enters fullscreen. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index a3e811039a..14e58b28e5 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4579,12 +4579,6 @@ Cache Turn off input stream caching. See ``--cache``. ``--cache-secs=`` - Deprecated. Once this option is removed, there will be no way to limit the - cache size by time (only by size with ``--demuxer-max-bytes``). This option - is considered useless, since there is no good reason to limit the cache by - time, and the default value of this option is already something very high. - The interaction with the other cache options is also confusing. - 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. The default value is set to something diff --git a/demux/demux.c b/demux/demux.c index 5fa0528d3d..53ad455b46 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -121,8 +121,7 @@ const struct m_sub_options demux_conf = { M_RANGE(0, M_MAX_MEM_BYTES)}, {"demuxer-donate-buffer", OPT_FLAG(donate_fw)}, {"force-seekable", OPT_FLAG(force_seekable)}, - {"cache-secs", OPT_DOUBLE(min_secs_cache), M_RANGE(0, DBL_MAX), - .deprecation_message = "will use unlimited time"}, + {"cache-secs", OPT_DOUBLE(min_secs_cache), M_RANGE(0, DBL_MAX)}, {"access-references", OPT_FLAG(access_references)}, {"demuxer-seekable-cache", OPT_CHOICE(seekable_cache, {"auto", -1}, {"no", 0}, {"yes", 1})}, -- cgit v1.2.3