X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=7af89e84d074b3c791032b96327465068b645e11;hp=b7397099c3e8c97f34d28a2fd9224cd8db7f279f;hb=4285355ff2bec853924647f0523d121860fe64e3;hpb=a28ef704adf8c5bfa45b3d6285f741af64758ceb

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index b7397099c..7af89e84d 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,11 +24,11 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "j2k_image_proxy.h"
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
+#include "ffmpeg_image_proxy.h"
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
-#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/mono_picture_asset.h>
@@ -38,37 +38,49 @@
 #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>
 #include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_image.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 
+#include "i18n.h"
+
 using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
+DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> c, bool fast)
 	: DCP (c)
+	, Decoder (film)
 	, _decode_referenced (false)
 {
-	video.reset (new VideoDecoder (this, c, log));
-	audio.reset (new AudioDecoder (this, c->audio, log));
-
-	subtitle.reset (
-		new SubtitleDecoder (
-			this,
-			c->subtitle,
-			log,
-			bind (&DCPDecoder::image_subtitles_during, this, _1, _2),
-			bind (&DCPDecoder::text_subtitles_during, this, _1, _2)
-			)
-		);
+	if (c->can_be_played()) {
+		if (c->video) {
+			video.reset (new VideoDecoder (this, c));
+		}
+		if (c->audio) {
+			audio.reset (new AudioDecoder (this, c->audio, fast));
+		}
+		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+			/* XXX: this time here should be the time of the first subtitle, not 0 */
+			text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, 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;
 		}
@@ -81,6 +93,8 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
 		cpl = cpls().front ();
 	}
 
+	set_decode_referenced (false);
+
 	_reels = cpl->reels ();
 
 	_reel = _reels.begin ();
@@ -88,44 +102,81 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
 	get_readers ();
 }
 
+
 bool
-DCPDecoder::pass (PassReason reason, bool)
+DCPDecoder::pass ()
 {
-	if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
+	if (!_dcp_content->can_be_played()) {
+		return true;
+	}
+
+	if (_reel == _reels.end()) {
+		if (audio) {
+			audio->flush ();
+		}
 		return true;
 	}
 
-	double const vfr = _dcp_content->active_video_frame_rate ();
+	double const vfr = _dcp_content->active_video_frame_rate (film());
 
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = _next.frames_round (vfr);
 
-	if ((_mono_reader || _stereo_reader) && reason != PASS_REASON_SUBTITLE && (_decode_referenced || !_dcp_content->reference_video())) {
-		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
+	shared_ptr<dcp::PictureAsset> picture_asset = (*_reel)->main_picture()->asset();
+	DCPOMATIC_ASSERT (picture_asset);
+
+	/* 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, picture_asset->size());
+
+	if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
 		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
 		if (_mono_reader) {
-			video->give (
+			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
-					new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size(), AV_PIX_FMT_XYZ12LE)
+					new J2KImageProxy (
+						_mono_reader->get_frame (entry_point + frame),
+						picture_asset->size(),
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
 					),
 				_offset + frame
 				);
 		} else {
-			video->give (
+			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
-					new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)),
+					new J2KImageProxy (
+						_stereo_reader->get_frame (entry_point + frame),
+						picture_asset->size(),
+						dcp::EYE_LEFT,
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
+					),
 				_offset + frame
 				);
 
-			video->give (
+			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
-					new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)),
+					new J2KImageProxy (
+						_stereo_reader->get_frame (entry_point + frame),
+						picture_asset->size(),
+						dcp::EYE_RIGHT,
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
+					),
 				_offset + frame
 				);
 		}
 	}
 
-	if (_sound_reader && reason != PASS_REASON_SUBTITLE && (_decode_referenced || !_dcp_content->reference_audio())) {
+	if (_sound_reader && (_decode_referenced || !_dcp_content->reference_audio())) {
 		int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
 		shared_ptr<const dcp::SoundFrame> sf = _sound_reader->get_frame (entry_point + frame);
 		uint8_t const * from = sf->data ();
@@ -141,27 +192,7 @@ DCPDecoder::pass (PassReason reason, bool)
 			}
 		}
 
-		audio->give (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
-	}
-
-	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 (
-			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->give_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
-				);
-		}
+		audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
 	}
 
 	_next += ContentTime::from_frames (1, vfr);
@@ -176,6 +207,105 @@ DCPDecoder::pass (PassReason reason, bool)
 	return false;
 }
 
+void
+DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
+{
+	list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+	if (decoder == text.end()) {
+		/* It's possible that there is now a main subtitle but no TextDecoders, for example if
+		   the CPL has just changed but the TextContent's texts have not been recreated yet.
+		*/
+		return;
+	}
+
+	if ((*_reel)->main_subtitle()) {
+		pass_texts (
+			next,
+			(*_reel)->main_subtitle()->asset(),
+			_dcp_content->reference_text(TEXT_OPEN_SUBTITLE),
+			(*_reel)->main_subtitle()->entry_point(),
+			*decoder,
+			size
+			);
+		++decoder;
+	}
+
+	BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
+		pass_texts (
+			next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size
+			);
+		++decoder;
+	}
+}
+
+void
+DCPDecoder::pass_texts (
+	ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<TextDecoder> decoder, dcp::Size size
+	)
+{
+	double const vfr = _dcp_content->active_video_frame_rate (film());
+	/* Frame within the (played part of the) reel that is coming up next */
+	int64_t const frame = next.frames_round (vfr);
+
+	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
+			);
+
+		list<dcp::SubtitleString> strings;
+
+		BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
+			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+			if (is) {
+				if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
+					dcp::SubtitleString b = strings.back();
+					decoder->emit_plain (
+						ContentTimePeriod (
+							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
+							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
+							),
+						strings
+						);
+					strings.clear ();
+				}
+
+				strings.push_back (*is);
+			}
+
+			/* 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 DCPSubtitleDecoder.
+			*/
+
+			shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+			if (ii) {
+				emit_subtitle_image (
+					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 ())
+						),
+					*ii,
+					size,
+					decoder
+					);
+			}
+		}
+
+		if (!strings.empty()) {
+			dcp::SubtitleString b = strings.back();
+			decoder->emit_plain (
+				ContentTimePeriod (
+					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
+					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
+					),
+				strings
+				);
+			strings.clear ();
+		}
+	}
+}
+
 void
 DCPDecoder::next_reel ()
 {
@@ -221,70 +351,73 @@ DCPDecoder::get_readers ()
 void
 DCPDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
-	audio->seek (t, accurate);
-	subtitle->seek (t, accurate);
+	if (!_dcp_content->can_be_played ()) {
+		return;
+	}
+
+	Decoder::seek (t, accurate);
 
 	_reel = _reels.begin ();
 	_offset = 0;
 	get_readers ();
 
-	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
-		next_reel ();
-	}
+	int const pre_roll_seconds = 2;
 
-	_next = t;
-}
+	/* Pre-roll for subs */
 
+	ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+	if (pre < ContentTime()) {
+		pre = ContentTime ();
+	}
 
-list<ContentTimePeriod>
-DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-	return list<ContentTimePeriod> ();
-}
+	/* Seek to pre-roll position */
 
-list<ContentTimePeriod>
-DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-	/* XXX: inefficient */
+	while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()))) {
+		ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()));
+		pre -= rd;
+		t -= rd;
+		next_reel ();
+	}
 
-	list<ContentTimePeriod> ctp;
-	double const vfr = _dcp_content->active_video_frame_rate ();
+	/* Pass texts in the pre-roll */
 
-	int offset = 0;
+	double const vfr = _dcp_content->active_video_frame_rate (film());
+	for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+		pass_texts (pre, (*_reel)->main_picture()->asset()->size());
+		pre += ContentTime::from_frames (1, vfr);
+	}
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
-		if (!r->main_subtitle ()) {
-			offset += r->main_picture()->duration();
-			continue;
-		}
+	/* Seek to correct position */
 
-		int64_t const entry_point = r->main_subtitle()->entry_point ();
+	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()))) {
+		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()));
+		next_reel ();
+	}
 
-		list<dcp::SubtitleString> subs = r->main_subtitle()->asset()->subtitles_during (
-			dcp::Time (period.from.seconds(), 1000) - dcp::Time (offset - entry_point, vfr, vfr),
-			dcp::Time (period.to.seconds(), 1000) - dcp::Time (offset - entry_point, vfr, vfr),
-			starting
-			);
+	_next = t;
+}
 
-		BOOST_FOREACH (dcp::SubtitleString const & s, subs) {
-			ctp.push_back (
-				ContentTimePeriod (
-					ContentTime::from_seconds (s.in().as_seconds ()) + ContentTime::from_frames (offset - entry_point, vfr),
-					ContentTime::from_seconds (s.out().as_seconds ()) + ContentTime::from_frames (offset - entry_point, vfr)
-					)
-				);
-		}
+void
+DCPDecoder::set_decode_referenced (bool r)
+{
+	_decode_referenced = r;
 
-		offset += r->main_subtitle()->duration();
+	if (video) {
+		video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
+	}
+	if (audio) {
+		audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
 	}
-
-	return ctp;
 }
 
 void
-DCPDecoder::set_decode_referenced ()
+DCPDecoder::set_forced_reduction (optional<int> reduction)
+{
+	_forced_reduction = reduction;
+}
+
+ContentTime
+DCPDecoder::position () const
 {
-	_decode_referenced = true;
+	return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
 }