X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=9de63dc936401748c8956c9217ce24ee1990637a;hp=71eb0bae0b04503fe23935d915cb4be39d3e05b1;hb=a498b8819ab431ecc2aac058b1aadb9e15d396ac;hpb=a5d004b0773f633401528392fc28e66d70e13ac8

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 71eb0bae0..9de63dc93 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -60,27 +60,27 @@ using std::string;
 using std::vector;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::optional;
 using namespace dcpomatic;
 
 DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> c, bool fast, bool tolerant, shared_ptr<DCPDecoder> old)
 	: DCP (c, tolerant)
 	, Decoder (film)
-	, _decode_referenced (false)
 {
 	if (c->can_be_played()) {
 		if (c->video) {
-			video.reset (new VideoDecoder (this, c));
+			video = make_shared<VideoDecoder>(this, c);
 		}
 		if (c->audio) {
-			audio.reset (new AudioDecoder (this, c->audio, fast));
+			audio = make_shared<AudioDecoder>(this, c->audio, fast);
 		}
 		for (auto 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())));
+			text.push_back (make_shared<TextDecoder>(this, i, ContentTime()));
 		}
 		if (c->atmos) {
-			atmos.reset (new AtmosDecoder (this, c));
+			atmos = make_shared<AtmosDecoder>(this, c);
 		}
 	}
 
@@ -98,7 +98,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
 		_reels = old->_reels;
 	} else {
 
-		list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+		auto cpl_list = cpls ();
 
 		if (cpl_list.empty()) {
 			throw DCPError (_("No CPLs found in DCP."));
@@ -124,7 +124,6 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
 	set_decode_referenced (false);
 
 	_reel = _reels.begin ();
-	_offset = 0;
 	get_readers ();
 }
 
@@ -178,7 +177,7 @@ DCPDecoder::pass ()
 					new J2KImageProxy (
 						_stereo_reader->get_frame (entry_point + frame),
 						picture_asset->size(),
-						dcp::EYE_LEFT,
+						dcp::Eye::LEFT,
 						AV_PIX_FMT_XYZ12LE,
 						_forced_reduction
 						)
@@ -192,7 +191,7 @@ DCPDecoder::pass ()
 					new J2KImageProxy (
 						_stereo_reader->get_frame (entry_point + frame),
 						picture_asset->size(),
-						dcp::EYE_RIGHT,
+						dcp::Eye::RIGHT,
 						AV_PIX_FMT_XYZ12LE,
 						_forced_reduction
 						)
@@ -242,7 +241,7 @@ DCPDecoder::pass ()
 void
 DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 {
-	list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+	auto 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.
@@ -254,7 +253,7 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 		pass_texts (
 			next,
 			(*_reel)->main_subtitle()->asset(),
-			_dcp_content->reference_text(TEXT_OPEN_SUBTITLE),
+			_dcp_content->reference_text(TextType::OPEN_SUBTITLE),
 			(*_reel)->main_subtitle()->entry_point().get_value_or(0),
 			*decoder,
 			size
@@ -264,7 +263,7 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 
 	for (auto i: (*_reel)->closed_captions()) {
 		pass_texts (
-			next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
+			next, i->asset(), _dcp_content->reference_text(TextType::CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
 			);
 		++decoder;
 	}
@@ -280,7 +279,7 @@ DCPDecoder::pass_texts (
 	int64_t const frame = next.frames_round (vfr);
 
 	if (_decode_referenced || !reference) {
-		list<shared_ptr<dcp::Subtitle> > subs = asset->subtitles_during (
+		auto subs = asset->subtitles_during (
 			dcp::Time (entry_point + frame, vfr, vfr),
 			dcp::Time (entry_point + frame + 1, vfr, vfr),
 			true
@@ -289,10 +288,10 @@ DCPDecoder::pass_texts (
 		list<dcp::SubtitleString> strings;
 
 		for (auto i: subs) {
-			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+			auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
 			if (is) {
 				if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
-					dcp::SubtitleString b = strings.back();
+					auto b = strings.back();
 					decoder->emit_plain (
 						ContentTimePeriod (
 							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -310,7 +309,7 @@ DCPDecoder::pass_texts (
 			   this would need to be done both here and in DCPSubtitleDecoder.
 			*/
 
-			shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+			auto ii = dynamic_pointer_cast<const dcp::SubtitleImage>(i);
 			if (ii) {
 				emit_subtitle_image (
 					ContentTimePeriod (
@@ -325,7 +324,7 @@ DCPDecoder::pass_texts (
 		}
 
 		if (!strings.empty()) {
-			dcp::SubtitleString b = strings.back();
+			auto b = strings.back();
 			decoder->emit_plain (
 				ContentTimePeriod (
 					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -364,9 +363,11 @@ DCPDecoder::get_readers ()
 		DCPOMATIC_ASSERT (mono || stereo);
 		if (mono) {
 			_mono_reader = mono->start_read ();
+			_mono_reader->set_check_hmac (false);
 			_stereo_reader.reset ();
 		} else {
 			_stereo_reader = stereo->start_read ();
+			_stereo_reader->set_check_hmac (false);
 			_mono_reader.reset ();
 		}
 	} else {
@@ -376,6 +377,7 @@ DCPDecoder::get_readers ()
 
 	if ((*_reel)->main_sound()) {
 		_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
+		_sound_reader->set_check_hmac (false);
 	} else {
 		_sound_reader.reset ();
 	}
@@ -383,6 +385,7 @@ DCPDecoder::get_readers ()
 	if ((*_reel)->atmos()) {
 		shared_ptr<dcp::AtmosAsset> asset = (*_reel)->atmos()->asset();
 		_atmos_reader = asset->start_read();
+		_atmos_reader->set_check_hmac (false);
 		_atmos_metadata = AtmosMetadata (asset);
 	} else {
 		_atmos_reader.reset ();