Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / subtitle_decoder.cc

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index d20196a63597f41a768e1aa7e1b98ab7c52010f0..a95964f4773602f0acfe88b4d468909bfce0fc81 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -21,6 +21,7 @@
 #include "subtitle_content.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -62,8 +63,15 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
                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);
        }