summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-19 23:27:09 +0200
committerwm4 <wm4@nowhere>2014-05-20 02:40:22 +0200
commit4664f8b3b7cd5089463623df02655ec11e258671 (patch)
tree1dfe5ed9633762ec8f50deabaa4e23b24104f401 /DOCS
parentac66bcc25955b41f71202273490d4073a013a7db (diff)
downloadmpv-4664f8b3b7cd5089463623df02655ec11e258671.tar.bz2
mpv-4664f8b3b7cd5089463623df02655ec11e258671.tar.xz
cache: redo options and default settings
Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/changes.rst2
-rw-r--r--DOCS/man/en/options.rst31
2 files changed, 17 insertions, 16 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 3a649144d6..9b810424e6 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -146,7 +146,7 @@ Command Line Switches
``-aspect`` ``--video-aspect``
``-ass-bottom-margin`` ``--vf=sub=bottom:top``
``-ass`` ``--sub-ass``
- ``-audiofile-cache`` ``--audio-file-cache``
+ ``-audiofile-cache`` (removed; the main cache settings are used)
``-audiofile`` ``--audio-file``
``-benchmark`` ``--untimed`` (no stats)
``-capture`` ``--stream-capture=<filename>``
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index f1de8b75bd..644ff7bfee 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -275,10 +275,6 @@ OPTIONS
Play audio from an external file (WAV, MP3 or Ogg Vorbis) while viewing a
movie.
-``--audio-file-cache=<kBytes>``
- Enables caching for the stream used by ``--audio-file``, using the
- specified amount of memory.
-
``--audio-format=<format>``
Select the sample format used for output from the audio filter layer to
the sound card. The values that ``<format>`` can adopt are listed below in
@@ -395,28 +391,33 @@ OPTIONS
because no space is reserved for seeking back yet.
``--cache-default=<kBytes|no>``
- Set the size of the cache in kilobytes (default: 320 KB). Using ``no``
+ Set the size of the cache in kilobytes (default: 25000 KB). Using ``no``
will not automatically enable the cache e.g. when playing from a network
stream. Note that using ``--cache`` will always override this option.
-``--cache-pause=<no|percentage>``
- If the cache percentage goes below the specified value, pause and wait
- until the percentage set by ``--cache-min`` is reached, then resume
- playback (default: 10). If ``no`` is specified, this behavior is disabled.
+``--cache-pause-below=<kBytes|no>``
+ If the cache size goes below the specified value (in KB), pause and wait
+ until the size set by ``--cache-pause-restart`` is reached, then resume
+ playback (default: 500). If ``no`` is specified, this behavior is disabled.
When the player is paused this way, the status line shows ``Buffering``
instead of ``Paused``, and the OSD uses a clock symbol instead of the
normal paused symbol.
-``--cache-min=<percentage>``
- Playback will start when the cache has been filled up to ``<percentage>`` of
- the total (default: 20).
+``--cache-pause-restart=<kBytes>``
+ If the cache is paused due to the ``--cache-pause-below`` functionality,
+ then the player unpauses as soon as the cache has this much data (in KB).
+ (Default: 1000)
+
+``--cache-initial=<kBytes>``
+ Playback will start when the cache has been filled up with this many
+ kilobytes of data (default: 0).
-``--cache-seek-min=<percentage>``
- If a seek is to be made to a position within ``<percentage>`` of the cache
+``--cache-seek-min=<kBytes>``
+ If a seek is to be made to a position within ``<kBytes>`` of the cache
size from the current position, mpv will wait for the cache to be
filled to this position rather than performing a stream seek (default:
- 50).
+ 500).
This matters for small forward seeks. With slow streams (especially http
streams) there is a tradeoff between skipping the data between current