From 822b247d10fe14c83e8d31223a3922f68695a196 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 17 Dec 2017 22:11:10 +0100 Subject: player: show demuxer cache buffered amount in bytes in the status line I don't want to add another field to display stream and demuxer cache separately, so just add them up. This strangely makes sense, since the forward buffered stream cache amount consists of data not read by the demuxer yet. (If the demuxer cache has buffered the full stream, the forward buffered stream cache amount is 0.) --- player/osd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'player/osd.c') diff --git a/player/osd.c b/player/osd.c index 9477dd3f38..e9fda355c4 100644 --- a/player/osd.c +++ b/player/osd.c @@ -261,11 +261,12 @@ static void term_osd_print_status_lazy(struct MPContext *mpctx) } else { saddf(&line, "%2ds", (int)s.ts_duration); } - if (info.size > 0) { - if (info.fill >= 1024 * 1024) { - saddf(&line, "+%lldMB", (long long)(info.fill / 1024 / 1024)); + int64_t cache_size = s.fw_bytes + info.fill; + if (cache_size > 0) { + if (cache_size >= 1024 * 1024) { + saddf(&line, "+%lldMB", (long long)(cache_size / 1024 / 1024)); } else { - saddf(&line, "+%lldKB", (long long)(info.fill / 1024)); + saddf(&line, "+%lldKB", (long long)(cache_size / 1024)); } } } -- cgit v1.2.3