X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=3cadcca47198c1c79c801585b425e04971146bca;hb=64a5419b16d676d48f36b4699cfe83a91ec78549;hp=50356da788e84c018f175e6c611a6d5a6313f52b;hpb=24e890682b3f2aa211277ad8b6b3591f2026d4be;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 50356da78..3cadcca47 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,42 +19,85 @@
 */
 
 #include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "text_decoder.h"
+#include <boost/optional.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::optional;
+using boost::shared_ptr;
+using boost::weak_ptr;
+using namespace dcpomatic;
 
-void
-Decoder::maybe_seek (optional<ContentTime>& position, ContentTime time, bool accurate)
+Decoder::Decoder (weak_ptr<const Film> film)
+	: _film (film)
 {
-	if (!position) {
-		/* A seek has just happened */
-		return;
+
+}
+
+/** @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(f) < *pos)) {
+		pos = video->position(f);
+	}
+
+	if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+		pos = audio->position(f);
 	}
 
-	if (time >= *position && time < (*position + ContentTime::from_seconds(1))) {
-		/* No need to seek: caller should just pass() */
-		return;
+	/* 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);
+			}
+		}
 	}
 
-	position.reset ();
-	seek (time, accurate);
+	return pos.get_value_or(ContentTime());
 }
 
 void
-Decoder::maybe_seek_video (ContentTime time, bool accurate)
+Decoder::seek (ContentTime, bool)
 {
-	maybe_seek (_video_position, time, accurate);
+	if (video) {
+		video->seek ();
+	}
+	if (audio) {
+		audio->seek ();
+	}
+	BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+		i->seek ();
+	}
 }
 
-void
-Decoder::maybe_seek_audio (ContentTime time, bool accurate)
+shared_ptr<TextDecoder>
+Decoder::only_text () const
 {
-	maybe_seek (_audio_position, time, accurate);
+	DCPOMATIC_ASSERT (text.size() < 2);
+	if (text.empty ()) {
+		return shared_ptr<TextDecoder> ();
+	}
+	return text.front ();
 }
 
-void
-Decoder::maybe_seek_subtitle (ContentTime time, bool accurate)
+shared_ptr<const Film>
+Decoder::film () const
 {
-	maybe_seek (_subtitle_position, time, accurate);
+	shared_ptr<const Film> f = _film.lock ();
+	DCPOMATIC_ASSERT (f);
+	return f;
 }