Supporters update.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index f912c473cd5d7e37513cb7fa4a93df133d2c93d6..5d191512874916c74a82eed7ce049b9e2e33803d 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
@@ -25,42 +26,55 @@
 #include <boost/optional.hpp>
 #include <iostream>
 
+
 using std::cout;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using namespace dcpomatic;
 
+
 Decoder::Decoder (weak_ptr<const Film> film)
-       : _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();
+       auto f = film();
 
-       if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+       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) < *pos)) {
+       if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
                pos = audio->position(f);
        }
 
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
-               if (!i->ignore() && (!pos || i->position(f) < *pos)) {
-                       pos = i->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::seek (ContentTime, bool)
 {
@@ -70,25 +84,18 @@ Decoder::seek (ContentTime, bool)
        if (audio) {
                audio->seek ();
        }
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+       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> ();
+       if (text.empty()) {
+               return {};
        }
-       return text.front ();
-}
-
-shared_ptr<const Film>
-Decoder::film () const
-{
-       shared_ptr<const Film> f = _film.lock ();
-       DCPOMATIC_ASSERT (f);
-       return f;
+       return text.front();
 }