summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-09-20 19:21:12 +0200
committerwm4 <wm4@nowhere>2019-09-20 19:22:03 +0200
commitce1e670a33c9e119f37b7b49bbbb7531b12630bf (patch)
treeaddab7b4e78ba0c365aa984c67cf7119b552ce32
parent0bdcbd75e001f6f344f28378227d5fbff0ed9a06 (diff)
downloadmpv-ce1e670a33c9e119f37b7b49bbbb7531b12630bf.tar.bz2
mpv-ce1e670a33c9e119f37b7b49bbbb7531b12630bf.tar.xz
player: update status line cache display
Replace the "+" with "/". The "+" was supposed to imply that the cache is the sum of the time (demuxer cache) and the size in bytes (stream cache). We could not provide something nicer, because we had no idea how many seconds of media was buffered in the stream cache. Now the stream cache is done, and both the duration and byte size show the amount buffered in the demuxer cache. Hopefully "/" is better to imply this properly. Update the manpage explanations too.
-rw-r--r--DOCS/man/mpv.rst8
-rw-r--r--player/osd.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 0fe7dc78b5..861ae17ef1 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -719,12 +719,10 @@ listed.
to the display as well, e.g.: ``Dropped: 4/34``. This happens only if
decoder frame dropping is enabled with the ``--framedrop`` options.
(``drop-frame-count`` property.)
-- Cache state, e.g. ``Cache: 2s+134KB``. Visible if the stream cache is enabled.
+- Cache state, e.g. ``Cache: 2s/134KB``. Visible if the stream cache is enabled.
The first value shows the amount of video buffered in the demuxer in seconds,
- the second value shows the sum of the demuxer forward cache size and the
- *additional* data buffered in the stream cache in kilobytes.
- (``demuxer-cache-duration``, ``demuxer-cache-state``, ``cache-used``
- properties.)
+ the second value shows the estimated size of the buffered amount in kilobytes.
+ (``demuxer-cache-duration`` and ``demuxer-cache-state`` properties.)
LOW LATENCY PLAYBACK
diff --git a/player/osd.c b/player/osd.c
index a12ccaa8b1..c2af83b08c 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -243,9 +243,9 @@ static char *get_term_status_msg(struct MPContext *mpctx)
int64_t cache_size = s.fw_bytes;
if (cache_size > 0) {
if (cache_size >= 1024 * 1024) {
- saddf(&line, "+%lldMB", (long long)(cache_size / 1024 / 1024));
+ saddf(&line, "/%lldMB", (long long)(cache_size / 1024 / 1024));
} else {
- saddf(&line, "+%lldKB", (long long)(cache_size / 1024));
+ saddf(&line, "/%lldKB", (long long)(cache_size / 1024));
}
}
}