X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=30e3372522e50c4e73e417add515a143232396ff;hb=refs%2Fheads%2Fhelp;hp=4b189189e0b61fc395e83658968a1b34cf44947b;hpb=7c73ec405fdb55bd78d82d764999b5af6d81e973;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 4b189189e..30e337252 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,6 +48,7 @@
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_image.h>
 #include <dcp/decrypted_kdm.h>
+#include <dcp/reel_atmos_asset.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -75,6 +78,9 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
 			/* 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())));
 		}
+		if (c->atmos) {
+			atmos.reset (new AtmosDecoder (this, c));
+		}
 	}
 
 	/* We try to avoid re-scanning the DCP's files every time we make a new DCPDecoder; we do this
@@ -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;
 	}
 
@@ -207,6 +220,11 @@ DCPDecoder::pass ()
 		audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
 	}
 
+	if (_atmos_reader) {
+		DCPOMATIC_ASSERT (_atmos_metadata);
+		atmos->emit (film(), _atmos_reader->get_frame(frame), frame, *_atmos_metadata);
+	}
+
 	_next += ContentTime::from_frames (1, vfr);
 
 	if ((*_reel)->main_picture ()) {
@@ -223,8 +241,14 @@ void
 DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 {
 	list<shared_ptr<TextDecoder> >::const_iterator 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.
+		*/
+		return;
+	}
+
 	if ((*_reel)->main_subtitle()) {
-		DCPOMATIC_ASSERT (decoder != text.end ());
 		pass_texts (
 			next,
 			(*_reel)->main_subtitle()->asset(),
@@ -235,8 +259,8 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 			);
 		++decoder;
 	}
+
 	BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
-		DCPOMATIC_ASSERT (decoder != text.end ());
 		pass_texts (
 			next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
 			);
@@ -327,6 +351,7 @@ DCPDecoder::get_readers ()
 		_mono_reader.reset ();
 		_stereo_reader.reset ();
 		_sound_reader.reset ();
+		_atmos_reader.reset ();
 		return;
 	}
 
@@ -352,6 +377,15 @@ DCPDecoder::get_readers ()
 	} else {
 		_sound_reader.reset ();
 	}
+
+	if ((*_reel)->atmos()) {
+		shared_ptr<dcp::AtmosAsset> asset = (*_reel)->atmos()->asset();
+		_atmos_reader = asset->start_read();
+		_atmos_metadata = AtmosMetadata (asset);
+	} else {
+		_atmos_reader.reset ();
+		_atmos_metadata = boost::none;
+	}
 }
 
 void
@@ -437,10 +471,18 @@ DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
 	BOOST_FOREACH (boost::filesystem::path 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;
+}