diff options
author | wm4 <wm4@nowhere> | 2016-04-19 22:01:30 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-04-19 22:01:30 +0200 |
commit | 8db9206c54cb2208178e23e21961545741810a9f (patch) | |
tree | 82d5c52f5f42acad631c10c405332cb0c4e88022 /player/command.c | |
parent | 503dada42f1ea1007768da0dc6a41b67cdf89400 (diff) | |
download | mpv-8db9206c54cb2208178e23e21961545741810a9f.tar.bz2 mpv-8db9206c54cb2208178e23e21961545741810a9f.tar.xz |
player: simplify an aspect of buffering determination
Calculate the buffering percentage in the same code which determines
whether the player is or should be buffering. In particular it can't
happen that percentage and buffering state are slightly out of sync due
to calling DEMUXER_CTRL_GET_READER_STATE and reusing it with the
previously determined buffering state.
Now it's also easier to guarantee that the buffering state is updated
properly.
Add some more verbose output as well.
(Damn I hate this code, why did I write it?)
Diffstat (limited to 'player/command.c')
-rw-r--r-- | player/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c index cdadafa892..bfdcb820d3 100644 --- a/player/command.c +++ b/player/command.c @@ -1518,10 +1518,10 @@ static int mp_property_cache_buffering(void *ctx, struct m_property *prop, int action, void *arg) { MPContext *mpctx = ctx; - double state = get_cache_buffering_percentage(mpctx); + int state = get_cache_buffering_percentage(mpctx); if (state < 0) return M_PROPERTY_UNAVAILABLE; - return m_property_int_ro(action, arg, state * 100); + return m_property_int_ro(action, arg, state); } static int mp_property_clock(void *ctx, struct m_property *prop, |