X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=758ddea2674174bc4e6d2b68c03811de481c6fc3;hb=2f796cd531de522a3b7ed03a9942f3c55f3a0b5b;hp=95cad926620ad9a4824b40e8ff1914331d3e776e;hpb=19f51503621a57794bd79bac053c9e6549a69f46;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 95cad9266..758ddea26 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 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"
@@ -28,6 +29,8 @@
 #include "ffmpeg_image_proxy.h"
 #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>
@@ -45,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>
 
@@ -52,6 +56,7 @@
 
 using std::list;
 using std::cout;
+using std::string;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -73,18 +78,23 @@ 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));
+		}
 	}
 
-	if (old) {
-		_reels = old->_reels;
+	/* We try to avoid re-scanning the DCP's files every time we make a new DCPDecoder; we do this
+	   by re-using the _reels list.  Before we do this we need to check that nothing too serious
+	   has changed in the DCPContent.
 
-		/* We might have gained a KDM since we made the Reel objects */
-		if (_dcp_content->kdm ()) {
-			dcp::DecryptedKDM k = decrypted_kdm ();
-			BOOST_FOREACH (shared_ptr<dcp::Reel> i, _reels) {
-				i->add (k);
-			}
-		}
+	   We do this by storing a digest of the important bits of the DCPContent and then checking that's
+	   the same before we re-use _reels.
+	*/
+
+	_lazy_digest = calculate_lazy_digest (c);
+
+	if (old && old->lazy_digest() == _lazy_digest) {
+		_reels = old->_reels;
 	} else {
 
 		list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
@@ -121,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;
 	}
 
@@ -203,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 ()) {
@@ -219,8 +242,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(),
@@ -231,8 +260,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
 			);
@@ -323,6 +352,7 @@ DCPDecoder::get_readers ()
 		_mono_reader.reset ();
 		_stereo_reader.reset ();
 		_sound_reader.reset ();
+		_atmos_reader.reset ();
 		return;
 	}
 
@@ -348,6 +378,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
@@ -425,3 +464,26 @@ DCPDecoder::set_forced_reduction (optional<int> reduction)
 {
 	_forced_reduction = reduction;
 }
+
+string
+DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
+{
+	Digester d;
+	BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
+		d.add (i.string());
+	}
+	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;
+}