Fix font_id_map errors when importing DCP subtitles that have no

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index c4044691943334d2cefb575b50f5a23e6716fb5c..5d191512874916c74a82eed7ce049b9e2e33803d 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,60 +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 <iostream>
-#include "film.h"
-#include "exceptions.h"
-#include "util.h"
 #include "decoder.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::optional;
+using std::shared_ptr;
+using std::weak_ptr;
+using namespace dcpomatic;
 
-using std::string;
-using boost::shared_ptr;
 
-/** @param f Film.
- *  @param o Decode options.
- */
-Decoder::Decoder (shared_ptr<const Film> f)
-       : _film (f)
+Decoder::Decoder (weak_ptr<const Film> film)
+       : WeakConstFilm (film)
 {
-       _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
+
 }
 
-/** Seek to a position as a source timestamp in seconds.
- *  @return true on error.
- */
-bool
-Decoder::seek (double)
+
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
 {
-       throw DecodeError (N_("decoder does not support seek"));
+       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());
 }
 
-/** Seek so that the next frame we will produce is the same as the last one.
- *  @return true on error.
- */
-bool
-Decoder::seek_to_last ()
+
+void
+Decoder::seek (ContentTime, bool)
+{
+       if (video) {
+               video->seek ();
+       }
+       if (audio) {
+               audio->seek ();
+       }
+       for (auto i: text) {
+               i->seek ();
+       }
+}
+
+
+shared_ptr<TextDecoder>
+Decoder::only_text () const
 {
-       throw DecodeError (N_("decoder does not support seek"));
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty()) {
+               return {};
+       }
+       return text.front();
 }