X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=024d62f3424f3138f2f84f190e5f99119d4a8984;hb=924f4edb20d14bc697956254951fb87513cf2e19;hp=5d5e1f6311019dc5269b3f7f29856629fa65d6ac;hpb=6e5c998593842ff76f5d0ae5cab0d03cbe11b607;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 5d5e1f631..024d62f34 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,31 @@
 
 */
 
+
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
+#include <dcp/load_font_node.h>
 #include <iostream>
 
-using std::list;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::list;
+using std::map;
+using std::string;
+using std::vector;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::bind;
+using namespace dcpomatic;
+
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
 	: Decoder (film)
 {
-	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+	auto c = load (content->path(0));
+	c->fix_empty_font_ids ();
 	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
 
@@ -40,21 +50,35 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
 	if (_next != _subtitles.end()) {
 		first = content_time_period(*_next).from;
 	}
-	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
+	text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
+
+	auto fm = c->font_data();
+	for (auto const& i: fm) {
+		_fonts.push_back (FontData(i.first, i.second));
+	}
+
+	/* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+	for (auto i: c->load_font_nodes()) {
+		if (fm.find(i->id) == fm.end()) {
+			_fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
+		}
+	}
 }
 
+
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
 	Decoder::seek (time, accurate);
 
 	_next = _subtitles.begin ();
-	list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+	auto i = _subtitles.begin ();
 	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
 }
 
+
 bool
 DCPSubtitleDecoder::pass ()
 {
@@ -71,23 +95,23 @@ DCPSubtitleDecoder::pass ()
 
 	list<dcp::SubtitleString> s;
 	list<dcp::SubtitleImage> i;
-	ContentTimePeriod const p = content_time_period (*_next);
+	auto const p = content_time_period (*_next);
 
 	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
-		shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+		auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
 		if (ns) {
 			s.push_back (*ns);
 			++_next;
-		}
-
-		/* XXX: perhaps these image subs should also be collected together like the string ones are;
-		   this would need to be done both here and in DCPDecoder.
-		*/
-
-		shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
-		if (ni) {
-			emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
-			++_next;
+		} else {
+			/* XXX: perhaps these image subs should also be collected together like the string ones are;
+			   this would need to be done both here and in DCPDecoder.
+			*/
+
+			auto ni = dynamic_pointer_cast<const dcp::SubtitleImage>(*_next);
+			if (ni) {
+				emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+				++_next;
+			}
 		}
 	}
 
@@ -95,11 +119,20 @@ DCPSubtitleDecoder::pass ()
 	return false;
 }
 
+
 ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
 {
-	return ContentTimePeriod (
-		ContentTime::from_seconds (s->in().as_seconds ()),
-		ContentTime::from_seconds (s->out().as_seconds ())
-		);
+	return {
+		ContentTime::from_seconds(s->in().as_seconds()),
+		ContentTime::from_seconds(s->out().as_seconds())
+	};
 }
+
+
+vector<dcpomatic::FontData>
+DCPSubtitleDecoder::fonts () const
+{
+	return _fonts;
+}
+