X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=c437ec9457b839c8095c444cc1bca828639d4a77;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=b31b4873ff1a5ef756d26edb0121f38db03d9b09;hpb=ac2fa2172c30c234a19628d7a9ae696e435a56db;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index b31b4873f..c437ec945 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -21,9 +21,12 @@
 #include "subtitle_decoder.h"
 #include "subtitle_content.h"
 #include "util.h"
+#include "log.h"
+#include "compose.hpp"
 #include <sub/subtitle.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
 #include <iostream>
 
 using std::list;
@@ -37,13 +40,10 @@ using boost::function;
 SubtitleDecoder::SubtitleDecoder (
 	Decoder* parent,
 	shared_ptr<const SubtitleContent> c,
-	function<list<ContentTimePeriod> (ContentTimePeriod, bool)> image_during,
-	function<list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+	shared_ptr<Log> log
 	)
-	: _parent (parent)
+	: DecoderPart (parent, log)
 	, _content (c)
-	, _image_during (image_during)
-	, _text_during (text_during)
 {
 
 }
@@ -56,95 +56,29 @@ SubtitleDecoder::SubtitleDecoder (
  *  of the video frame)
  */
 void
-SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::emit_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
 {
-	_decoded_image.push_back (ContentImageSubtitle (period, image, rect));
+	ImageData (ContentImageSubtitle (period, image, rect));
 }
 
 void
-SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
+SubtitleDecoder::emit_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
 {
-	_decoded_text.push_back (ContentTextSubtitle (period, s));
-}
-
-/** @param sp Full periods of subtitles that are showing or starting during the specified period */
-template <class T>
-list<T>
-SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate)
-{
-	if (sp.empty ()) {
-		/* Nothing in this period */
-		return list<T> ();
-	}
-
-	/* Seek if what we want is before what we have, or a more than a little bit after */
-	if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (1))) {
-		_parent->seek (sp.front().from, true);
-	}
-
-	/* Now enough pass() calls will either:
-	 *  (a) give us what we want, or
-	 *  (b) hit the end of the decoder.
-	 */
-	while (!_parent->pass(Decoder::PASS_REASON_SUBTITLE, accurate) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
-
-	/* Now look for what we wanted in the data we have collected */
-	/* XXX: inefficient */
-
-	list<T> out;
-	for (typename list<T>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-		if ((starting && period.contains (i->period().from)) || (!starting && period.overlaps (i->period ()))) {
-			out.push_back (*i);
-		}
-	}
-
-	/* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */
-
-	list<ContentImageSubtitle>::iterator i = _decoded_image.begin();
-	while (i != _decoded_image.end()) {
-		list<ContentImageSubtitle>::iterator tmp = i;
-		++tmp;
-
-		if (
-			i->period().to < (period.from - ContentTime::from_seconds (5)) ||
-			i->period().from > (period.to + ContentTime::from_seconds (5))
-			) {
-			_decoded_image.erase (i);
-		}
-
-		i = tmp;
+	/* We must escape < and > in strings, otherwise they might confuse our subtitle
+	   renderer (which uses some HTML-esque markup to do bold/italic etc.)
+	*/
+	BOOST_FOREACH (dcp::SubtitleString& i, s) {
+		string t = i.text ();
+		boost::algorithm::replace_all (t, "<", "&lt;");
+		boost::algorithm::replace_all (t, ">", "&gt;");
+		i.set_text (t);
 	}
 
-	return out;
-}
-
-list<ContentTextSubtitle>
-SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate)
-{
-	return get<ContentTextSubtitle> (_decoded_text, _text_during (period, starting), period, starting, accurate);
-}
-
-list<ContentImageSubtitle>
-SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate)
-{
-	return get<ContentImageSubtitle> (_decoded_image, _image_during (period, starting), period, starting, accurate);
-}
-
-void
-SubtitleDecoder::seek (ContentTime, bool)
-{
-	reset ();
-}
-
-void
-SubtitleDecoder::reset ()
-{
-	_decoded_text.clear ();
-	_decoded_image.clear ();
+	TextData (ContentTextSubtitle (period, s));
 }
 
 void
-SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subtitle)
+SubtitleDecoder::emit_text (ContentTimePeriod period, sub::Subtitle const & subtitle)
 {
 	/* See if our next subtitle needs to be placed on screen by us */
 	bool needs_placement = false;
@@ -159,7 +93,7 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt
 		}
 	}
 
-	/* Find the lowest proportional postion */
+	/* Find the lowest proportional position */
 	optional<float> lowest_proportional;
 	BOOST_FOREACH (sub::Line i, subtitle.lines) {
 		if (i.vertical_position.proportional) {
@@ -176,7 +110,7 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt
 		BOOST_FOREACH (sub::Block j, i.blocks) {
 
 			if (!j.font_size.specified()) {
-				/* Fallback default font size if none other has been specified */
+				/* Fallback default font size if no other has been specified */
 				j.font_size.set_points (48);
 			}
 
@@ -245,12 +179,12 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt
 					j.text,
 					effect,
 					content()->effect_colour(),
-					dcp::Time (0, 1000),
-					dcp::Time (0, 1000)
+					dcp::Time (content()->fade_in().seconds(), 1000),
+					dcp::Time (content()->fade_out().seconds(), 1000)
 					)
 				);
 		}
 	}
 
-	give_text (period, out);
+	emit_text (period, out);
 }