X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=52e8c04e6984f26d389d74ec61189fa80f749a69;hp=53a0c31e140d6ceab0a3d2f222fe419bda88237b;hb=HEAD;hpb=cc3900735839ff4b0da0c046b5c606c440ba917a

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 53a0c31e1..5d1915128 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,79 +1,101 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-/** @file  src/decoder.cc
- *  @brief Parent class for decoders of content.
- */
 
-#include "film.h"
 #include "decoder.h"
-#include "decoded.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "text_decoder.h"
+#include <boost/optional.hpp>
+#include <iostream>
 
-#include "i18n.h"
 
 using std::cout;
-using boost::shared_ptr;
-
-/** @param f Film.
- *  @param o Decode options.
- */
-Decoder::Decoder (shared_ptr<const Film> f)
-	: _film (f)
-	, _done (false)
+using boost::optional;
+using std::shared_ptr;
+using std::weak_ptr;
+using namespace dcpomatic;
+
+
+Decoder::Decoder (weak_ptr<const Film> film)
+	: WeakConstFilm (film)
 {
 
 }
 
-struct DecodedSorter
+
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
 {
-	bool operator() (shared_ptr<Decoded> a, shared_ptr<Decoded> b)
-	{
-		return a->dcp_time < b->dcp_time;
+	optional<ContentTime> pos;
+	auto f = film();
+
+	if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) {
+		pos = video->position(f);
 	}
-};
 
-shared_ptr<Decoded>
-Decoder::peek ()
-{
-	while (!_done && _pending.empty ()) {
-		_done = pass ();
+	if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
+		pos = audio->position(f);
 	}
 
-	if (_done && _pending.empty ()) {
-		return shared_ptr<Decoded> ();
+	/* 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);
+			}
+		}
 	}
 
-	_pending.sort (DecodedSorter ());
-	return _pending.front ();
+	return pos.get_value_or(ContentTime());
 }
 
+
 void
-Decoder::consume ()
+Decoder::seek (ContentTime, bool)
 {
-	if (!_pending.empty ()) {
-		_pending.pop_front ();
+	if (video) {
+		video->seek ();
+	}
+	if (audio) {
+		audio->seek ();
+	}
+	for (auto i: text) {
+		i->seek ();
 	}
 }
 
-void
-Decoder::seek (ContentTime, bool)
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
 {
-	_pending.clear ();
-	_done = false;
+	DCPOMATIC_ASSERT (text.size() < 2);
+	if (text.empty()) {
+		return {};
+	}
+	return text.front();
 }