summaryrefslogtreecommitdiffstats
path: root/mp_core.h
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-11 06:16:14 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-11 06:16:14 +0000
commitc60af33716cee5c4f515b47308c5a43556624990 (patch)
tree96aae4fa1495e9ae028bdb3973a318504fd9fb7b /mp_core.h
parentccb97f109804f236bc13d25c200dbdc01c0a93cb (diff)
downloadmpv-c60af33716cee5c4f515b47308c5a43556624990.tar.bz2
mpv-c60af33716cee5c4f515b47308c5a43556624990.tar.xz
Move the sh_audio->delay field to mpctx->delay.
The value is related to overall a/v sync and is not used by audio demuxers or decoders. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp_core.h')
-rw-r--r--mp_core.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/mp_core.h b/mp_core.h
index 4f5659c067..bc46471303 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -66,6 +66,13 @@ typedef struct MPContext {
// struct.
int num_buffered_frames;
+ // AV sync: the next frame should be shown when the audio out has this
+ // much (in seconds) buffered data left. Increased when more data is
+ // written to the ao, decreased when moving to the next frame.
+ // In the audio-only case used as a timer since the last seek
+ // by the audio CPU usage meter.
+ double delay;
+
float begin_skip; ///< start time of the current skip while on edlout mode
// audio is muted if either EDL or user activates mute
short edl_muted; ///< Stores whether EDL is currently in muted mode.