X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=85fa41ddde0a9e5c1e7ce075a4013fb606961cfc;hb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;hp=1a4896fe700f3f09b0eb94f092dd4527def1e814;hpb=6a68937320fa76ce213c648845abc73983fc1849;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 1a4896fe7..85fa41ddd 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -24,7 +24,7 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "j2k_image_proxy.h"
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
@@ -37,6 +37,7 @@
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_frame.h>
@@ -44,6 +45,8 @@
 #include <boost/foreach.hpp>
 #include <iostream>
 
+#include "i18n.h"
+
 using std::list;
 using std::cout;
 using boost::shared_ptr;
@@ -54,17 +57,25 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
 	: DCP (c)
 	, _decode_referenced (false)
 {
-	video.reset (new VideoDecoder (this, c, log));
+	if (c->video) {
+		video.reset (new VideoDecoder (this, c, log));
+	}
 	if (c->audio) {
 		audio.reset (new AudioDecoder (this, c->audio, log, fast));
 	}
-	if (c->subtitle) {
+	BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
 		/* XXX: this time here should be the time of the first subtitle, not 0 */
-		subtitle.reset (new SubtitleDecoder (this, c->subtitle, log, ContentTime()));
+		text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, log, ContentTime())));
+	}
+
+	list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+
+	if (cpl_list.empty()) {
+		throw DCPError (_("No CPLs found in DCP."));
 	}
 
 	shared_ptr<dcp::CPL> cpl;
-	BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
+	BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
 		if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
 			cpl = i;
 		}
@@ -77,6 +88,8 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
 		cpl = cpls().front ();
 	}
 
+	set_decode_referenced (false);
+
 	_reels = cpl->reels ();
 
 	_reel = _reels.begin ();
@@ -84,6 +97,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
 	get_readers ();
 }
 
+
 bool
 DCPDecoder::pass ()
 {
@@ -96,6 +110,11 @@ DCPDecoder::pass ()
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = _next.frames_round (vfr);
 
+	/* We must emit texts first as when we emit the video for this frame
+	   it will expect already to have the texts.
+	*/
+	pass_texts (_next);
+
 	if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
 		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
 		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
@@ -159,8 +178,6 @@ DCPDecoder::pass ()
 		audio->emit (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
 	}
 
-	pass_subtitles (_next);
-
 	_next += ContentTime::from_frames (1, vfr);
 
 	if ((*_reel)->main_picture ()) {
@@ -174,29 +191,52 @@ DCPDecoder::pass ()
 }
 
 void
-DCPDecoder::pass_subtitles (ContentTime next)
+DCPDecoder::pass_texts (ContentTime next)
+{
+	list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+	if ((*_reel)->main_subtitle()) {
+		pass_texts (
+			next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), (*_reel)->main_subtitle()->entry_point(), *decoder
+			);
+		++decoder;
+	}
+	if ((*_reel)->closed_caption()) {
+		pass_texts (
+			next, (*_reel)->closed_caption()->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), (*_reel)->closed_caption()->entry_point(), *decoder
+			);
+		++decoder;
+	}
+}
+
+void
+DCPDecoder::pass_texts (ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<TextDecoder> decoder)
 {
 	double const vfr = _dcp_content->active_video_frame_rate ();
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = next.frames_round (vfr);
 
-	if ((*_reel)->main_subtitle() && (_decode_referenced || !_dcp_content->reference_subtitle())) {
-		int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
-		list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
+	if (_decode_referenced || !reference) {
+		list<shared_ptr<dcp::Subtitle> > subs = asset->subtitles_during (
 			dcp::Time (entry_point + frame, vfr, vfr),
 			dcp::Time (entry_point + frame + 1, vfr, vfr),
 			true
 			);
 
-		if (!subs.empty ()) {
-			/* XXX: assuming that all `subs' are at the same time; maybe this is ok */
-			subtitle->emit_text (
-				ContentTimePeriod (
-					ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().in().as_seconds ()),
-					ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().out().as_seconds ())
-					),
-				subs
-				);
+		BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
+			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+			if (is) {
+				list<dcp::SubtitleString> s;
+				s.push_back (*is);
+				decoder->emit_plain (
+					ContentTimePeriod (
+						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()),
+						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ())
+						),
+					s
+					);
+			}
+
+			/* XXX: image subtitles */
 		}
 	}
 }
@@ -246,36 +286,40 @@ DCPDecoder::get_readers ()
 void
 DCPDecoder::seek (ContentTime t, bool accurate)
 {
+	if (!_dcp_content->can_be_played ()) {
+		return;
+	}
+
 	Decoder::seek (t, accurate);
 
 	_reel = _reels.begin ();
 	_offset = 0;
 	get_readers ();
 
-	if (accurate) {
-		int const pre_roll_seconds = 2;
+	int const pre_roll_seconds = 2;
 
-		/* Pre-roll for subs */
+	/* Pre-roll for subs */
 
-		ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
-		if (pre < ContentTime()) {
-			pre = ContentTime ();
-		}
+	ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+	if (pre < ContentTime()) {
+		pre = ContentTime ();
+	}
 
-		/* Seek to pre-roll position */
+	/* Seek to pre-roll position */
 
-		while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-			pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
-			next_reel ();
-		}
+	while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+		ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+		pre -= rd;
+		t -= rd;
+		next_reel ();
+	}
 
-		/* Pass subtitles in the pre-roll */
+	/* Pass texts in the pre-roll */
 
-		double const vfr = _dcp_content->active_video_frame_rate ();
-		for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
-			pass_subtitles (pre);
-			pre += ContentTime::from_frames (1, vfr);
-		}
+	double const vfr = _dcp_content->active_video_frame_rate ();
+	for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+		pass_texts (pre);
+		pre += ContentTime::from_frames (1, vfr);
 	}
 
 	/* Seek to correct position */
@@ -289,9 +333,16 @@ DCPDecoder::seek (ContentTime t, bool accurate)
 }
 
 void
-DCPDecoder::set_decode_referenced ()
+DCPDecoder::set_decode_referenced (bool r)
 {
-	_decode_referenced = true;
+	_decode_referenced = r;
+
+	if (video) {
+		video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
+	}
+	if (audio) {
+		audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
+	}
 }
 
 void