X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=44053c5dff791b43747d7c2c0dabd6a66d82413b;hb=19988f49c34b6f420da5a7014fc7c205e8e895a2;hp=4f17bdb3b9293b1c6359e39b90a018ae4a677776;hpb=24e890682b3f2aa211277ad8b6b3591f2026d4be;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 4f17bdb3b..44053c5df 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,22 +48,19 @@ 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 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)
-			)
-		);
+	if (c->audio) {
+		audio.reset (new AudioDecoder (this, c->audio, log, fast));
+	}
+	if (c->subtitle) {
+		subtitle.reset (new SubtitleDecoder (this, c->subtitle, log));
+	}
 
 	shared_ptr<dcp::CPL> cpl;
 	BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
@@ -88,7 +84,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;
@@ -99,32 +95,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 (
+			video->emit (
 				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),
+						asset->size(),
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
 					),
 				_offset + frame
 				);
 		} else {
-			video->give (
+			video->emit (
 				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),
+						asset->size(),
+						dcp::EYE_LEFT,
+						AV_PIX_FMT_XYZ12LE,
+						_forced_reduction
+						)
+					),
 				_offset + frame
 				);
 
-			video->give (
+			video->emit (
 				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),
+						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 ();
@@ -140,9 +155,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 (
@@ -153,7 +189,7 @@ DCPDecoder::pass (PassReason reason, bool)
 
 		if (!subs.empty ()) {
 			/* XXX: assuming that all `subs' are at the same time; maybe this is ok */
-			subtitle->give_text (
+			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 ())
@@ -162,18 +198,6 @@ DCPDecoder::pass (PassReason reason, bool)
 				);
 		}
 	}
-
-	_video_position = _audio_position = _subtitle_position = _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
@@ -221,66 +245,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);
 
 	_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 ();
-	}
-
-	_next = t;
-}
-
-
-list<ContentTimePeriod>
-DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
-{
-	return list<ContentTimePeriod> ();
-}
+	if (accurate) {
+		int const pre_roll_seconds = 2;
 
-list<ContentTimePeriod>
-DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-	/* XXX: inefficient */
+		/* Pre-roll for subs */
 
-	list<ContentTimePeriod> ctp;
-	double const vfr = _dcp_content->active_video_frame_rate ();
+		ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+		if (pre < ContentTime()) {
+			pre = ContentTime ();
+		}
 
-	int offset = 0;
+		/* Seek to pre-roll position */
 
-	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
-		if (!r->main_subtitle ()) {
-			offset += r->main_picture()->duration();
-			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 (offset - entry_point, vfr, vfr),
-			dcp::Time (period.to.seconds(), 1000) - dcp::Time (offset - 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_frames (offset - entry_point, vfr),
-					ContentTime::from_seconds (s.out().as_seconds ()) + ContentTime::from_frames (offset - entry_point, vfr)
-					)
-				);
+		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);
 		}
+	}
 
-		offset += r->main_subtitle()->duration();
+	/* 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 ();
 	}
 
-	return ctp;
+	_next = t;
 }
 
 void
@@ -288,3 +292,9 @@ DCPDecoder::set_decode_referenced ()
 {
 	_decode_referenced = true;
 }
+
+void
+DCPDecoder::set_forced_reduction (optional<int> reduction)
+{
+	_forced_reduction = reduction;
+}