X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=3379f8e90e427bf469cacb939608332cf7fc148c;hb=70a7bb2bd72f90642e01ed660f7d7de495ea0370;hp=35fe375e9b97c925c02d25c9d240e152b1712b53;hpb=0cb31de2be2b51a8bc19e55ceb1b86dc26ea1c42;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 35fe375e9..3379f8e90 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -28,7 +28,6 @@
 #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>
@@ -49,30 +48,45 @@ 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)
-	: _dcp_content (c)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
+	: DCP (c)
 	, _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,
-			bind (&DCPDecoder::image_subtitles_during, this, _1, _2),
-			bind (&DCPDecoder::text_subtitles_during, this, _1, _2)
-			)
-		);
-
-	dcp::DCP dcp (c->directory ());
-	dcp.read (false, 0, true);
-	if (c->kdm ()) {
-		dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
+	if (c->audio) {
+		audio.reset (new AudioDecoder (this, c->audio, log, fast));
+	}
+	if (c->subtitle) {
+		/* XXX: this time here should be the time of the first subtitle, not 0 */
+		subtitle.reset (new SubtitleDecoder (this, c->subtitle, log, ContentTime()));
+	}
+
+	shared_ptr<dcp::CPL> cpl;
+	BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
+		if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
+			cpl = i;
+		}
+	}
+
+	if (!cpl) {
+		/* No CPL found; probably an old file that doesn't specify it;
+		   just use the first one.
+		*/
+		cpl = cpls().front ();
+	}
+
+	if (!_decode_referenced) {
+		if (c->reference_video()) {
+			video->set_ignore();
+		}
+		if (c->reference_audio()) {
+			audio->set_ignore();
+		}
 	}
-	DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
-	_reels = dcp.cpls().front()->reels ();
+
+	_reels = cpl->reels ();
 
 	_reel = _reels.begin ();
 	_offset = 0;
@@ -80,7 +94,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
 }
 
 bool
-DCPDecoder::pass (PassReason reason, bool)
+DCPDecoder::pass ()
 {
 	if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
 		return true;
@@ -91,25 +105,51 @@ DCPDecoder::pass (PassReason reason, bool)
 	/* 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())) {
+	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 ();
 		if (_mono_reader) {
-			video->give (shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size())), _offset + frame);
+			video->emit (
+				shared_ptr<ImageProxy> (
+					new J2KImageProxy (
+						_mono_reader->get_frame (entry_point + frame),
+						asset->size(),
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
+					),
+				_offset + frame
+				);
 		} else {
-			video->give (
-				shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
+			video->emit (
+				shared_ptr<ImageProxy> (
+					new J2KImageProxy (
+						_stereo_reader->get_frame (entry_point + frame),
+						asset->size(),
+						dcp::EYE_LEFT,
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
+					),
 				_offset + frame
 				);
 
-			video->give (
-				shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
+			video->emit (
+				shared_ptr<ImageProxy> (
+					new J2KImageProxy (
+						_stereo_reader->get_frame (entry_point + frame),
+						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 ();
@@ -125,9 +165,30 @@ DCPDecoder::pass (PassReason reason, bool)
 			}
 		}
 
-		audio->give (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
+		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 ()) {
+		if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
+			next_reel ();
+			_next = ContentTime ();
+		}
 	}
 
+	return false;
+}
+
+void
+DCPDecoder::pass_subtitles (ContentTime next)
+{
+	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 (
@@ -136,28 +197,18 @@ DCPDecoder::pass (PassReason reason, bool)
 			true
 			);
 
-		if (!subs.empty ()) {
-			/* XXX: assuming that all `subs' are at the same time; maybe this is ok */
-			subtitle->give_text (
+		BOOST_FOREACH (dcp::SubtitleString i, subs) {
+			list<dcp::SubtitleString> s;
+			s.push_back (i);
+			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 ())
+					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 ())
 					),
-				subs
+				s
 				);
 		}
 	}
-
-	_next += ContentTime::from_frames (1, vfr);
-
-	if ((*_reel)->main_picture ()) {
-		if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
-			next_reel ();
-			_next = ContentTime ();
-		}
-	}
-
-	return false;
 }
 
 void
@@ -171,7 +222,7 @@ DCPDecoder::next_reel ()
 void
 DCPDecoder::get_readers ()
 {
-	if (_reel == _reels.end()) {
+	if (_reel == _reels.end() || !_dcp_content->can_be_played ()) {
 		_mono_reader.reset ();
 		_stereo_reader.reset ();
 		_sound_reader.reset ();
@@ -205,59 +256,46 @@ DCPDecoder::get_readers ()
 void
 DCPDecoder::seek (ContentTime t, bool accurate)
 {
-	video->seek (t, accurate);
-	audio->seek (t, accurate);
-	subtitle->seek (t, accurate);
+	Decoder::seek (t, accurate);
 
-	_offset = 0;
 	_reel = _reels.begin ();
-	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 ();
-	}
-
-	_next = t;
-}
+	_offset = 0;
+	get_readers ();
 
+	if (accurate) {
+		int const pre_roll_seconds = 2;
 
-list<ContentTimePeriod>
-DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-	return list<ContentTimePeriod> ();
-}
+		/* Pre-roll for subs */
 
-list<ContentTimePeriod>
-DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-	/* XXX: inefficient */
+		ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+		if (pre < ContentTime()) {
+			pre = ContentTime ();
+		}
 
-	list<ContentTimePeriod> ctp;
-	double const vfr = _dcp_content->active_video_frame_rate ();
+		/* Seek to pre-roll position */
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
-		if (!r->main_subtitle ()) {
-			continue;
+		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 ();
 		}
 
-		int64_t const entry_point = r->main_subtitle()->entry_point ();
-
-		list<dcp::SubtitleString> subs = r->main_subtitle()->asset()->subtitles_during (
-			dcp::Time (period.from.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
-			dcp::Time (period.to.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
-			starting
-			);
+		/* Pass subtitles in the pre-roll */
 
-		BOOST_FOREACH (dcp::SubtitleString const & s, subs) {
-			ctp.push_back (
-				ContentTimePeriod (
-					ContentTime::from_seconds (s.in().as_seconds ()),
-					ContentTime::from_seconds (s.out().as_seconds ())
-					)
-				);
+		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);
 		}
 	}
 
-	return ctp;
+	/* Seek to correct position */
+
+	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 ();
+	}
+
+	_next = t;
 }
 
 void
@@ -265,3 +303,9 @@ DCPDecoder::set_decode_referenced ()
 {
 	_decode_referenced = true;
 }
+
+void
+DCPDecoder::set_forced_reduction (optional<int> reduction)
+{
+	_forced_reduction = reduction;
+}