Revert "Avoid decoding other packets when looking for subs."

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 95d7bdca4a8cba8f9b35e28e2ae6f4ff54f9c894..1c6b973d683913722e4b6cecb2570bed205b0f21 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -20,6 +20,7 @@
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -46,16 +47,28 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-DCPSubtitleDecoder::pass (PassReason)
+DCPSubtitleDecoder::pass ()
 {
        if (_next == _subtitles.end ()) {
                return true;
        }
 
+       /* Gather all subtitles with the same time period that are next
+          on the list.  We must emit all subtitles for the same time
+          period with the same text_subtitle() call otherwise the
+          SubtitleDecoder will assume there is nothing else at the
+          time of emit the first.
+       */
+
        list<dcp::SubtitleString> s;
-       s.push_back (*_next);
-       text_subtitle (s);
-       ++_next;
+       ContentTimePeriod const p = content_time_period (*_next);
+
+       while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+               s.push_back (*_next);
+               ++_next;
+       }
+
+       text_subtitle (p, s);
 
        return false;
 }
@@ -65,7 +78,7 @@ DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
 {
        return list<ContentTimePeriod> ();
 }
-       
+
 list<ContentTimePeriod>
 DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
@@ -74,11 +87,7 @@ DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) c
        list<ContentTimePeriod> d;
 
        for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-               ContentTimePeriod period (
-                       ContentTime::from_seconds (i->in().as_seconds ()),
-                       ContentTime::from_seconds (i->out().as_seconds ())
-                       );
-               
+               ContentTimePeriod period = content_time_period (*i);
                if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
                        d.push_back (period);
                }
@@ -87,3 +96,11 @@ DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) c
        return d;
 }
 
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
+{
+       return ContentTimePeriod (
+               ContentTime::from_seconds (s.in().as_seconds ()),
+               ContentTime::from_seconds (s.out().as_seconds ())
+               );
+}