diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-20 23:34:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-20 23:34:59 +0000 |
| commit | 775826079275839005d2168b190f96e32215afd0 (patch) | |
| tree | 8297950852fb970e1e77931f3cc4f8789220e2aa /src/lib/player.h | |
| parent | 66f15e8fc998061c78675e499fa88ab1e17e318d (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.h | 2 |
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 { |