summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-12 22:26:35 +0200
committerwm4 <wm4@nowhere>2015-08-12 22:26:35 +0200
commita17d5e4bddab412488fea1bd7f7d56034c5a5d7d (patch)
treee073f3c6ff9d90041160ffa24a5fdca0d135c8f6
parent828881816acbfae0451e038c45e63b6784681daa (diff)
downloadmpv-a17d5e4bddab412488fea1bd7f7d56034c5a5d7d.tar.bz2
mpv-a17d5e4bddab412488fea1bd7f7d56034c5a5d7d.tar.xz
player: use OSD formattin for DS on the terminal status line
-rw-r--r--DOCS/man/mpv.rst7
-rw-r--r--player/osd.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index e2487ddfda..5b94062e68 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -527,9 +527,10 @@ listed.
this will indicate a problem. (``total-avsync-change`` property.)
- Encoding state in ``{...}``, only shown in encoding mode.
- Display sync state. If display sync is active (``display-sync-active``
- property), this shows ``DS: 1.002``, where the number is the speed change
- factor applied to audio to achieve sync to display (``audio-speed-correction``
- property). In sync modes which don't resample, this will always be ``1.000``.
+ property), this shows ``DS: +0.02598%``, where the number is the speed change
+ factor applied to audio to achieve sync to display, expressed in percent
+ deviation from 1.0 (``audio-speed-correction`` property). In sync modes which
+ don't resample, this will always be ``+0.00000%``.
- Missed frames, e.g. ``Missed: 4``. (``vo-missed-frame-count`` property.) Shows
up in display sync mode only. This is incremented each time a frame took
longer to display than intended.
diff --git a/player/osd.c b/player/osd.c
index ace465b18d..8a000862eb 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -226,7 +226,11 @@ static void print_status(struct MPContext *mpctx)
// VO stats
if (mpctx->d_video) {
if (mpctx->display_sync_active) {
- saddf(&line, " DS: %f", mpctx->speed_factor_a);
+ char *f =
+ mp_property_expand_string(mpctx, "${audio-speed-correction}");
+ if (f)
+ saddf(&line, " DS: %s", f);
+ talloc_free(f);
int64_t m = vo_get_missed_count(mpctx->video_out);
if (m > 0)
saddf(&line, " Missed: %"PRId64, m);