BOOST_FOREACH.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index e7e6b8620e9332e0dc51f79f8c5d4e743f884758..bf0bd1a26945783d3501b9f91e82ac358a5bedc0 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,23 +27,44 @@
 
 using std::cout;
 using boost::optional;
+using std::shared_ptr;
+using std::weak_ptr;
+using namespace dcpomatic;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+       : WeakConstFilm (film)
+{
+
+}
 
 /** @return Earliest time of content that the next pass() will emit */
 ContentTime
 Decoder::position () const
 {
        optional<ContentTime> pos;
+       shared_ptr<const Film> f = film();
 
-       if (video && !video->ignore() && (!pos || video->position() < *pos)) {
-               pos = video->position();
+       if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) {
+               pos = video->position(f);
        }
 
-       if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
-               pos = audio->position();
+       if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
+               pos = audio->position(f);
        }
 
-       if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) {
-               pos = subtitle->position();
+       /* Only decide position based on subtitle sources if there is nothing else
+          to go on.  Otherwise we can have problems with muxed sources which have
+          (for example) video, audio and a subtitle.  If the subtitle data runs out
+          before the video/audio the position() call will return the position of the
+          end of the subs.  This causes this file to be pass()ed in favour of others,
+          which can cause bugs like #1581.
+       */
+       if (!pos) {
+               for (auto i: text) {
+                       if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+                               pos = i->position(f);
+                       }
+               }
        }
 
        return pos.get_value_or(ContentTime());
@@ -58,7 +79,17 @@ Decoder::seek (ContentTime, bool)
        if (audio) {
                audio->seek ();
        }
-       if (subtitle) {
-               subtitle->seek ();
+       for (auto i: text) {
+               i->seek ();
+       }
+}
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
+{
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty ()) {
+               return shared_ptr<TextDecoder> ();
        }
+       return text.front ();
 }