X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=59b44ae975ee5080c48ec6599535bf21d390c915;hp=f9b0d9a57461e92cb98e0578f86c7e920a259f59;hb=037b18b34e3e3fd9b9e692d85f35de17ab67aff8;hpb=39fb8198febde1937019db1c300ec363aab5aa56

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index f9b0d9a57..59b44ae97 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -160,41 +160,35 @@ DCPDecoder::pass ()
 		if (_mono_reader) {
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_mono_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_mono_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 		} else {
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::Eye::LEFT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::LEFT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
 
 			video->emit (
 				film(),
-				shared_ptr<ImageProxy> (
-					new J2KImageProxy (
-						_stereo_reader->get_frame (entry_point + frame),
-						picture_asset->size(),
-						dcp::Eye::RIGHT,
-						AV_PIX_FMT_XYZ12LE,
-						_forced_reduction
-						)
+				std::make_shared<J2KImageProxy>(
+					_stereo_reader->get_frame (entry_point + frame),
+					picture_asset->size(),
+					dcp::Eye::RIGHT,
+					AV_PIX_FMT_XYZ12LE,
+					_forced_reduction
 					),
 				_offset + frame
 				);
@@ -363,9 +357,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 {
@@ -375,6 +371,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 ();
 	}
@@ -382,6 +379,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 ();