summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-20 23:34:59 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-20 23:37:24 +0000
commita0eff2446835a2a29d751a4810fe182c486a2eb6 (patch)
tree3a6b9e6c6724d2356c97c2cf14810ef79c85af53 /src/lib/player.h
parentd920b12b4d05fa1b0e95e1178ee21c671e0ae431 (diff)
Add a 2-frame `delay' on content arriving at the player to give
subtitle content the chance to catch up. Fixes problems observed when overlaying a DCP subtitle onto an existing DCP and then seeking into the first subtitle. After the seek the decoder positions were: DCP: 0. subtitle: first subtitle time. This causes the DCP decoder to be pass()ed first and so the subtitle for the video frame has not arrived yet. I hope this does not cause unpredicted side effects...
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index 0b8540c15..58ed4e369 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -33,6 +33,7 @@
#include "audio_stream.h"
#include "audio_merger.h"
#include "empty.h"
+#include "delay.h"
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <list>
@@ -159,6 +160,7 @@ private:
AudioMerger _audio_merger;
Shuffler* _shuffler;
+ Delay* _delay;
class StreamState
{