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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 826b4e8d3..9de63dc93 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+#include "atmos_decoder.h"
 #include "dcp_decoder.h"
 #include "dcp_content.h"
 #include "audio_content.h"
@@ -29,6 +30,7 @@
 #include "image.h"
 #include "config.h"
 #include "digester.h"
+#include "frame_interval_checker.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -46,34 +48,39 @@
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_image.h>
 #include <dcp/decrypted_kdm.h>
-#include <boost/foreach.hpp>
+#include <dcp/reel_atmos_asset.h>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::list;
 using std::cout;
+using std::map;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+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);
 		}
-		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+		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 = make_shared<AtmosDecoder>(this, c);
 		}
 	}
 
@@ -91,14 +98,14 @@ 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."));
 		}
 
 		shared_ptr<dcp::CPL> cpl;
-		BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
+		for (auto i: cpl_list) {
 			if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
 				cpl = i;
 			}
@@ -117,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 ();
 }
 
@@ -125,7 +131,14 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
 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;
 	}
 
@@ -164,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
 						)
@@ -178,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
 						)
@@ -207,6 +220,12 @@ DCPDecoder::pass ()
 		audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
 	}
 
+	if (_atmos_reader) {
+		DCPOMATIC_ASSERT (_atmos_metadata);
+		int64_t const entry_point = (*_reel)->atmos()->entry_point().get_value_or(0);
+		atmos->emit (film(), _atmos_reader->get_frame(entry_point + frame), _offset + frame, *_atmos_metadata);
+	}
+
 	_next += ContentTime::from_frames (1, vfr);
 
 	if ((*_reel)->main_picture ()) {
@@ -222,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.
@@ -234,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
@@ -242,9 +261,9 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 		++decoder;
 	}
 
-	BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
+	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;
 	}
@@ -260,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
@@ -268,11 +287,11 @@ DCPDecoder::pass_texts (
 
 		list<dcp::SubtitleString> strings;
 
-		BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
-			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+		for (auto i: subs) {
+			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()),
@@ -290,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 (
@@ -305,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()),
@@ -333,6 +352,7 @@ DCPDecoder::get_readers ()
 		_mono_reader.reset ();
 		_stereo_reader.reset ();
 		_sound_reader.reset ();
+		_atmos_reader.reset ();
 		return;
 	}
 
@@ -343,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 {
@@ -355,9 +377,20 @@ 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 ();
 	}
+
+	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 ();
+		_atmos_metadata = boost::none;
+	}
 }
 
 void
@@ -440,13 +473,38 @@ string
 DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
 {
 	Digester d;
-	BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
+	for (auto i: c->paths()) {
 		d.add (i.string());
 	}
-	d.add (static_cast<bool>(_dcp_content->kdm()));
+	if (_dcp_content->kdm()) {
+		d.add(_dcp_content->kdm()->id());
+	}
 	d.add (static_cast<bool>(c->cpl()));
 	if (c->cpl()) {
 		d.add (c->cpl().get());
 	}
 	return d.get ();
 }
+
+ContentTime
+DCPDecoder::position () const
+{
+	return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
+}
+
+
+vector<FontData>
+DCPDecoder::fonts () const
+{
+	vector<FontData> data;
+	for (auto i: _reels) {
+		if (i->main_subtitle() && i->main_subtitle()->asset()) {
+			map<string, dcp::ArrayData> fm = i->main_subtitle()->asset()->font_data();
+			for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
+				data.push_back (FontData(j->first, j->second));
+			}
+		}
+	}
+	return data;
+}
+