Supporters update.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index e538a51d4af06a65c718e4eae0a5c8dfee46c993..5d191512874916c74a82eed7ce049b9e2e33803d 100644 (file)
--- 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,84 @@
 
 */
 
+
 #include "decoder.h"
-#include "decoder_part.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 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;
+       auto f = film();
+
+       if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) {
+               pos = video->position(f);
+       }
+
+       if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
+               pos = audio->position(f);
+       }
+
+       /* 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());
+}
+
 
 void
-Decoder::maybe_seek (opional<ContentTime> position, ContentTime time, bool accurate)
+Decoder::seek (ContentTime, bool)
 {
-       if (position && (time >= position.get() && time < (position.get() + ContentTime::from_seconds(1)))) {
-               /* No need to seek: caller should just pass() */
-               return;
+       if (video) {
+               video->seek ();
        }
+       if (audio) {
+               audio->seek ();
+       }
+       for (auto i: text) {
+               i->seek ();
+       }
+}
 
-       seek (time, accurate);
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
+{
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty()) {
+               return {};
+       }
+       return text.front();
 }