X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=0f2bc4358008e62123e8e042a8247c142e317c71;hb=8902a7adb63e2dac24e877ed1035bf344397c260;hp=52949a0989d83be7895f2117591a3dc7fedadc17;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 52949a098..0f2bc4358 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -28,24 +28,42 @@
 using std::cout;
 using boost::optional;
 using boost::shared_ptr;
+using boost::weak_ptr;
+using namespace dcpomatic;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+	: _film (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);
 	}
 
-	BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
-		if (!i->ignore() && (!pos || i->position() < *pos)) {
-			pos = i->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) {
+		BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+			if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+				pos = i->position(f);
+			}
 		}
 	}
 
@@ -61,17 +79,25 @@ Decoder::seek (ContentTime, bool)
 	if (audio) {
 		audio->seek ();
 	}
-	BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
 		i->seek ();
 	}
 }
 
 shared_ptr<TextDecoder>
-Decoder::only_caption () const
+Decoder::only_text () const
 {
-	DCPOMATIC_ASSERT (caption.size() < 2);
-	if (caption.empty ()) {
+	DCPOMATIC_ASSERT (text.size() < 2);
+	if (text.empty ()) {
 		return shared_ptr<TextDecoder> ();
 	}
-	return caption.front ();
+	return text.front ();
+}
+
+shared_ptr<const Film>
+Decoder::film () const
+{
+	shared_ptr<const Film> f = _film.lock ();
+	DCPOMATIC_ASSERT (f);
+	return f;
 }