X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=83faa1e93f19fbed0d3094b378ff1b97942e9cbd;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hp=c7a9a863f038b5993688bd5a0b7ccb0695c88dbe;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index c7a9a863f..83faa1e93 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,20 +18,31 @@
 
 */
 
-#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::dynamic_pointer_cast;
-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)));
+	/* Load the XML or MXF file */
+	auto const c = load (content->path(0));
+	c->fix_empty_font_ids ();
 	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
 
@@ -39,21 +50,23 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
 	if (_next != _subtitles.end()) {
 		first = content_time_period(*_next).from;
 	}
-	caption.reset (new CaptionDecoder (this, content->caption, log, first));
+	text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
 }
 
+
 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 ()
 {
@@ -63,33 +76,56 @@ 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 plain_text() call otherwise the
-	   CaptionDecoder 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) {
-		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;
+		} 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;
+			}
 		}
-
-		/* XXX: image subtitles */
 	}
 
-	caption->emit_plain (p, s);
+	only_text()->emit_plain (p, s);
 	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 {
+		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
 {
-	return ContentTimePeriod (
-		ContentTime::from_seconds (s->in().as_seconds ()),
-		ContentTime::from_seconds (s->out().as_seconds ())
-		);
+	if (_subtitles.empty()) {
+		return {};
+	}
+
+	return ContentTime::from_seconds(_subtitles[0]->in().as_seconds());
 }
+