*/
-#include <boost/shared_ptr.hpp>
#include "subtitle_decoder.h"
#include "subtitle_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
using std::list;
using std::cout;
}
void
-SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
+SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleString> s)
{
- _decoded_text_subtitles.push_back (ContentTextSubtitle (s));
+ _decoded_text_subtitles.push_back (ContentTextSubtitle (period, s));
}
/** @param sp Full periods of subtitles that are showing or starting during the specified period */
return list<T> ();
}
- /* Seek if what we want is before what we have, or more than a reasonable amount after */
- if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (5))) {
+ /* Seek if what we want is before what we have, or a more than a little bit after.
+ Be careful with the length of this `little bit'; consider the case where the last
+ subs were just less than this little bit B ago. Then we will not seek, but instead
+ pass() for nearly B seconds; if we are a FFmpegDecoder then this will generate B's
+ worth of video which will stack up. If B + the pre-roll is bigger than the maximum
+ number of frames that the VideoDecoder will keep then we will get an assertion
+ failure in VideoDecoder.
+ */
+ if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (1))) {
seek (sp.front().from, true);
}