X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.cc;h=f34c495c0eb03eaf3621ae1b533e70b958b6bc6e;hp=20a9f32fee031ddd99fc03f19ab1d5182614e6f7;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=fc56dc97103d00437843a31e1ef0c4915900ad1a

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 20a9f32fe..f34c495c0 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,46 +1,58 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 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/>.
 
 */
 
-#include <dcp/subtitle_content.h>
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
 
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+using boost::bind;
+using namespace dcpomatic;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
-	: SubtitleDecoder (content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+	: Decoder (film)
 {
-	dcp::SubtitleContent c (content->path (0), false);
-	_subtitles = c.subtitles ();
+	shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+	c->fix_empty_font_ids ();
+	_subtitles = c->subtitles ();
 	_next = _subtitles.begin ();
+
+	ContentTime first;
+	if (_next != _subtitles.end()) {
+		first = content_time_period(*_next).from;
+	}
+	text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
 }
 
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-	SubtitleDecoder::seek (time, 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().to_seconds()) < time) {
+	list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+	while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
 		++i;
 	}
 }
@@ -52,32 +64,44 @@ DCPSubtitleDecoder::pass ()
 		return true;
 	}
 
+	/* 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 emit*() call otherwise the
+	   TextDecoder will assume there is nothing else at the
+	   time of emitting the first.
+	*/
+
 	list<dcp::SubtitleString> s;
-	s.push_back (*_next);
-	text_subtitle (s);
-	++_next;
+	list<dcp::SubtitleImage> i;
+	ContentTimePeriod 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);
+		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.
+			*/
+
+			shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+			if (ni) {
+				emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+				++_next;
+			}
+		}
+	}
 
+	only_text()->emit_plain (p, s);
 	return false;
 }
 
-list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
 {
-	/* XXX: inefficient */
-
-	list<ContentTimePeriod> d;
-
-	for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-		ContentTimePeriod period (
-			ContentTime::from_seconds (i->in().to_seconds ()),
-			ContentTime::from_seconds (i->out().to_seconds ())
-			);
-		
-		if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
-			d.push_back (period);
-		}
-	}
-
-	return d;
+	return ContentTimePeriod (
+		ContentTime::from_seconds (s->in().as_seconds ()),
+		ContentTime::from_seconds (s->out().as_seconds ())
+		);
 }
-