X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=08c2bf7ec3642a86f687d9d4d24e6f7cbeaa663c;hb=e7efb7d651d4555ed8dd2b3c4980b5222d1e0521;hp=965f9db61dc20d9719b16a2a0a2d8ecdc027fa0d;hpb=6a68937320fa76ce213c648845abc73983fc1849;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 965f9db61..08c2bf7ec 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,41 +18,54 @@
 
 */
 
-#include "dcp_subtitle_decoder.h"
+
 #include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
+#include "font.h"
+#include "text_content.h"
 #include <dcp/interop_subtitle_asset.h>
-#include <iostream>
+#include <dcp/load_font_node.h>
+
 
+using std::dynamic_pointer_cast;
 using std::list;
-using std::cout;
-using boost::shared_ptr;
-using boost::bind;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using boost::optional;
+using namespace dcpomatic;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
+
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+	: Decoder (film)
 {
-	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
-	_subtitles = c->subtitles ();
+	/* Load the XML or MXF file */
+	auto const asset = load (content->path(0));
+	asset->fix_empty_font_ids ();
+	_subtitles = asset->subtitles ();
 	_next = _subtitles.begin ();
 
-	ContentTime first;
-	if (_next != _subtitles.end()) {
-		first = content_time_period(*_next).from;
-	}
-	subtitle.reset (new SubtitleDecoder (this, content->subtitle, log, first));
+	text.push_back (make_shared<TextDecoder>(this, content->only_text()));
+	update_position();
 }
 
+
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
 	Decoder::seek (time, accurate);
 
 	_next = _subtitles.begin ();
-	list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
-	while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().as_seconds()) < time) {
+	auto i = _subtitles.begin ();
+	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
+
+	update_position();
 }
 
+
 bool
 DCPSubtitleDecoder::pass ()
 {
@@ -62,28 +75,70 @@ DCPSubtitleDecoder::pass ()
 
 	/* Gather all subtitles with the same time period that are next
 	   on the list.  We must emit all subtitles for the same time
-	   period with the same text_subtitle() call otherwise the
-	   SubtitleDecoder will assume there is nothing else at the
-	   time of emit the first.
+	   period with the same emit*() call otherwise the
+	   TextDecoder will assume there is nothing else at the
+	   time of emitting the first.
 	*/
 
-	list<dcp::SubtitleString> s;
-	ContentTimePeriod const p = content_time_period (*_next);
+	vector<dcp::SubtitleString> s;
+	vector<dcp::SubtitleImage> i;
+	auto const p = content_time_period (*_next);
 
 	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
-		s.push_back (*_next);
-		++_next;
+		auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
+		if (ns) {
+			s.push_back (*ns);
+			++_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;
+			}
+		}
 	}
 
-	subtitle->emit_text (p, s);
+	only_text()->emit_plain (p, s);
+
+	update_position();
+
 	return false;
 }
 
+
 ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (dcp::SubtitleString 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())
+	};
 }
+
+
+/** @return time of first subtitle, if there is one */
+optional<ContentTime>
+DCPSubtitleDecoder::first () const
+{
+	if (_subtitles.empty()) {
+		return {};
+	}
+
+	return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
+}
+
+
+void
+DCPSubtitleDecoder::update_position()
+{
+	if (_next != _subtitles.end()) {
+		only_text()->maybe_set_position(
+			ContentTime::from_seconds((*_next)->in().as_seconds())
+			);
+	}
+}
+