summaryrefslogtreecommitdiffstats
path: root/mpvcore/player/mp_core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-27 20:57:08 +0100
committerwm4 <wm4@nowhere>2013-11-27 21:14:39 +0100
commitaa73ac8db81b8efb04bf2a5c7256e8a847f49fed (patch)
treec4cf23208ded424cb57314f55e0f0d15f23bdd74 /mpvcore/player/mp_core.h
parent5d97ac229a9a536a2fc5c746fd8a64c805001b6a (diff)
downloadmpv-aa73ac8db81b8efb04bf2a5c7256e8a847f49fed.tar.bz2
mpv-aa73ac8db81b8efb04bf2a5c7256e8a847f49fed.tar.xz
video: replace d_video->pts field, change PTS jump checks
The d_video->pts field was a bit strange. The code overwrote it multiple times (on decoding, on filtering, then once again...), and it wasn't really clear what purpose this field had exactly. Replace it with the mpctx->video_next_pts field, which is relatively unambiguous. Move the decreasing PTS check to dec_video.c. This means it acts on decoder output, not on filter output. (Just like in the previous commit, assume the filter chain is sane.) Drop the jitter vs. reset semantics; the dec_video.c determined PTS never goes backwards, and demuxer timestamps don't "jitter".
Diffstat (limited to 'mpvcore/player/mp_core.h')
-rw-r--r--mpvcore/player/mp_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h
index c1fbf737f3..4aabf6a991 100644
--- a/mpvcore/player/mp_core.h
+++ b/mpvcore/player/mp_core.h
@@ -248,6 +248,9 @@ typedef struct MPContext {
// the same value if the status line is updated at a time where no new
// video frame is shown.
double last_av_difference;
+ /* Timestamp of the latest image that was queued on the VO, but not yet
+ * to be flipped. */
+ double video_next_pts;
/* timestamp of video frame currently visible on screen
* (or at least queued to be flipped by VO) */
double video_pts;