player: change framedrop display in the status line

Hopefully less confusing, and hopefully doesn't exceed the terminal
width in any situation.

2 files changed, 14 insertions, 12 deletions

diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 6fc267d8eb..4c2c1791b2 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -445,14 +445,15 @@ listed.
   if there is audio "missing", or not enough frames can be dropped. Usually
   this will indicate a problem. (``total-avsync-change`` property.)
 - Encoding state in ``{...}``, only shown in encoding mode.
-- Decoder-dropped video frames, e.g. ``SD: 2``. Shows up only if the count is
-  not 0. Normally should never show up, unless ``--framedrop`` is set to enable
-  this mode, and your CPU is too slow. (``drop-frame-count`` property.)
-- VO-dropped video frames, e.g. ``D: 4``. Shows up only if the count is not 0.
-  Can grow if the video framerate is higher than that of the display, or if
-  video rendering is too slow. Also can be incremented on "hiccups" and when
-  the video frame couldn't be displayed on time. (``vo-drop-frame-count``
-  property.)
+- Dropped frames, e.g. ``Dropped: 4``. Shows up only if the count is not 0. Can
+  grow if the video framerate is higher than that of the display, or if video
+  rendering is too slow. Also can be incremented on "hiccups" and when the video
+  frame couldn't be displayed on time. (``vo-drop-frame-count`` property.)
+  If the decoder drops frames, the number of decoder-dropped frames is appended
+  to the display as well, e.g.: ``Dropped: 4/34``. This should almost never
+  happen, unless decoder-framedropping is enabled with one of the
+  ``--framedrop`` options, the stream contains errors, or a weird codec is in
+  use. (``drop-frame-count`` property.)
 - 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 *additional* data buffered in the stream cache in
diff --git a/player/osd.c b/player/osd.c
index 34cf88f63c..2c6863eec8 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -229,11 +229,12 @@ static void print_status(struct MPContext *mpctx)
     {
         // VO stats
         if (mpctx->d_video) {
-            if (mpctx->drop_frame_cnt)
-                saddf(&line, " SD: %d", mpctx->drop_frame_cnt);
             int64_t c = vo_get_drop_count(mpctx->video_out);
-            if (c > 0)
-                saddf(&line, " D: %"PRId64, c);
+            if (c > 0 || mpctx->drop_frame_cnt > 0) {
+                saddf(&line, " Dropped: %"PRId64, c);
+                if (mpctx->drop_frame_cnt)
+                    saddf(&line, "/%d", mpctx->drop_frame_cnt);
+            }
         }
     }