X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=f5f21f2eac92e5799a901370ecd44c394d654ee2;hb=8475d7b7d70d5b98e7737f326653d80a9fd8e9cf;hp=eeea48e42979330322bb600793370bc147cdf122;hpb=48b82de5b6e8e07330a2f72dbddd8d9830fe047e;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index eeea48e42..f5f21f2ea 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,13 +27,17 @@
 #include "digester.h"
 #include "font.h"
 #include "compose.hpp"
+#include "config.h"
 #include "audio_buffers.h"
 #include "image.h"
+#include <dcp/atmos_asset.h>
+#include <dcp/atmos_asset_writer.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_writer.h>
 #include <dcp/reel.h>
+#include <dcp/reel_atmos_asset.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_stereo_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
@@ -65,55 +69,97 @@ using namespace dcpomatic;
 
 int const ReelWriter::_info_size = 48;
 
+static dcp::MXFMetadata
+mxf_metadata ()
+{
+	dcp::MXFMetadata meta;
+	Config* config = Config::instance();
+	if (!config->dcp_company_name().empty()) {
+		meta.company_name = config->dcp_company_name ();
+	}
+	if (!config->dcp_product_name().empty()) {
+		meta.product_name = config->dcp_product_name ();
+	}
+	if (!config->dcp_product_version().empty()) {
+		meta.product_version = config->dcp_product_version ();
+	}
+	return meta;
+}
+
 /** @param job Related job, or 0 */
 ReelWriter::ReelWriter (
 	shared_ptr<const Film> film, DCPTimePeriod period, shared_ptr<Job> job, int reel_index, int reel_count, optional<string> content_summary
 	)
 	: _film (film)
 	, _period (period)
-	, _last_written_video_frame (-1)
-	, _last_written_eyes (EYES_RIGHT)
 	, _reel_index (reel_index)
 	, _reel_count (reel_count)
 	, _content_summary (content_summary)
 	, _job (job)
 {
-	/* Create our picture asset in a subdirectory, named according to those
-	   film's parameters which affect the video output.  We will hard-link
-	   it into the DCP later.
+	/* Create or find our picture asset in a subdirectory, named
+	   according to those film's parameters which affect the video
+	   output.  We will hard-link it into the DCP later.
 	*/
 
 	dcp::Standard const standard = _film->interop() ? dcp::INTEROP : dcp::SMPTE;
 
-	if (_film->three_d ()) {
-		_picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
-	} else {
-		_picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
-	}
+	boost::filesystem::path const asset =
+		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period);
 
-	_picture_asset->set_size (_film->frame_size ());
+	_first_nonexistant_frame = check_existing_picture_asset (asset);
 
-	if (_film->encrypted ()) {
-		_picture_asset->set_key (_film->key ());
-		_picture_asset->set_context_id (_film->context_id ());
-	}
+	if (_first_nonexistant_frame < period.duration().frames_round(_film->video_frame_rate())) {
+		/* We do not have a complete picture asset.  If there is an
+		   existing asset, break any hard links to it as we are about
+		   to change its contents (if only by changing the IDs); see
+		   #1126.
+		*/
+		if (boost::filesystem::exists(asset) && boost::filesystem::hard_link_count(asset) > 1) {
+			if (job) {
+				job->sub (_("Copying old video file"));
+				copy_in_bits (asset, asset.string() + ".tmp", bind(&Job::set_progress, job.get(), _1, false));
+			} else {
+				boost::filesystem::copy_file (asset, asset.string() + ".tmp");
+			}
+			boost::filesystem::remove (asset);
+			boost::filesystem::rename (asset.string() + ".tmp", asset);
+		}
 
-	_picture_asset->set_file (
-		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period)
-		);
 
-	_first_nonexistant_frame = check_existing_picture_asset ();
+		if (_film->three_d ()) {
+			_picture_asset.reset (new dcp::StereoPictureAsset(dcp::Fraction(_film->video_frame_rate(), 1), standard));
+		} else {
+			_picture_asset.reset (new dcp::MonoPictureAsset(dcp::Fraction(_film->video_frame_rate(), 1), standard));
+		}
 
-	_picture_asset_writer = _picture_asset->start_write (
-		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period),
-		_first_nonexistant_frame > 0
-		);
+		_picture_asset->set_size (_film->frame_size());
+		_picture_asset->set_metadata (mxf_metadata());
+
+		if (_film->encrypted ()) {
+			_picture_asset->set_key (_film->key());
+			_picture_asset->set_context_id (_film->context_id());
+		}
+
+		_picture_asset->set_file (asset);
+		_picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0);
+	} else {
+		/* We already have a complete picture asset that we can just re-use */
+		/* XXX: what about if the encryption key changes? */
+		if (_film->three_d ()) {
+			_picture_asset.reset (new dcp::StereoPictureAsset(asset));
+		} else {
+			_picture_asset.reset (new dcp::MonoPictureAsset(asset));
+		}
+	}
 
 	if (_film->audio_channels ()) {
 		_sound_asset.reset (
 			new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard)
 			);
 
+		_sound_asset->set_metadata (mxf_metadata());
+
 		if (_film->encrypted ()) {
 			_sound_asset->set_key (_film->key ());
 		}
@@ -124,7 +170,8 @@ ReelWriter::ReelWriter (
 		   of the DCP directory until the last minute.
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
-			_film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary)
+			_film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
+			_film->contains_atmos_content()
 			);
 	}
 }
@@ -174,28 +221,10 @@ ReelWriter::frame_info_position (Frame frame, Eyes eyes) const
 }
 
 Frame
-ReelWriter::check_existing_picture_asset ()
+ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 {
-	DCPOMATIC_ASSERT (_picture_asset->file());
-	boost::filesystem::path asset = _picture_asset->file().get();
-
 	shared_ptr<Job> job = _job.lock ();
 
-	/* If there is an existing asset, break any hard links to it as we are about to change its contents
-	   (if only by changing the IDs); see #1126.
-	*/
-
-	if (boost::filesystem::exists(asset) && boost::filesystem::hard_link_count(asset) > 1) {
-		if (job) {
-			job->sub (_("Copying old video file"));
-			copy_in_bits (asset, asset.string() + ".tmp", bind(&Job::set_progress, job.get(), _1, false));
-		} else {
-			boost::filesystem::copy_file (asset, asset.string() + ".tmp");
-		}
-		boost::filesystem::remove (asset);
-		boost::filesystem::rename (asset.string() + ".tmp", asset);
-	}
-
 	if (job) {
 		job->sub (_("Checking existing image data"));
 	}
@@ -213,7 +242,7 @@ ReelWriter::check_existing_picture_asset ()
 
 	try {
 		info_file = _film->info_file_handle (_period, true);
-	} catch (OpenFileError) {
+	} catch (OpenFileError &) {
 		LOG_GENERAL_NC ("Could not open film info file");
 		fclose (asset_file);
 		return 0;
@@ -252,37 +281,63 @@ ReelWriter::check_existing_picture_asset ()
 void
 ReelWriter::write (optional<Data> encoded, Frame frame, Eyes eyes)
 {
+	if (!_picture_asset_writer) {
+		/* We're not writing any data */
+		return;
+	}
+
 	dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data().get (), encoded->size());
 	write_frame_info (frame, eyes, fin);
 	_last_written[eyes] = encoded;
-	_last_written_video_frame = frame;
-	_last_written_eyes = eyes;
 }
 
+
 void
-ReelWriter::fake_write (Frame frame, Eyes eyes, int size)
+ReelWriter::write (shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata)
 {
+	if (!_atmos_asset) {
+		_atmos_asset = metadata.create (dcp::Fraction(_film->video_frame_rate(), 1));
+		if (_film->encrypted()) {
+			_atmos_asset->set_key(_film->key());
+		}
+		_atmos_asset_writer = _atmos_asset->start_write (
+			_film->directory().get() / atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary)
+			);
+	}
+	_atmos_asset_writer->write (atmos);
+}
+
+
+void
+ReelWriter::fake_write (int size)
+{
+	if (!_picture_asset_writer) {
+		/* We're not writing any data */
+		return;
+	}
+
 	_picture_asset_writer->fake_write (size);
-	_last_written_video_frame = frame;
-	_last_written_eyes = eyes;
 }
 
 void
 ReelWriter::repeat_write (Frame frame, Eyes eyes)
 {
+	if (!_picture_asset_writer) {
+		/* We're not writing any data */
+		return;
+	}
+
 	dcp::FrameInfo fin = _picture_asset_writer->write (
 		_last_written[eyes]->data().get(),
 		_last_written[eyes]->size()
 		);
 	write_frame_info (frame, eyes, fin);
-	_last_written_video_frame = frame;
-	_last_written_eyes = eyes;
 }
 
 void
 ReelWriter::finish ()
 {
-	if (!_picture_asset_writer->finalize ()) {
+	if (_picture_asset_writer && !_picture_asset_writer->finalize ()) {
 		/* Nothing was written to the picture asset */
 		LOG_GENERAL ("Nothing was written to reel %1 of %2", _reel_index, _reel_count);
 		_picture_asset.reset ();
@@ -300,8 +355,12 @@ ReelWriter::finish ()
 		boost::filesystem::path video_to;
 		video_to /= _film->dir (_film->dcp_name());
 		video_to /= video_asset_filename (_picture_asset, _reel_index, _reel_count, _content_summary);
-
+		/* There may be an existing "to" file if we are recreating a DCP in the same place without
+		   changing any video.
+		*/
 		boost::system::error_code ec;
+		boost::filesystem::remove (video_to, ec);
+
 		boost::filesystem::create_hard_link (video_from, video_to, ec);
 		if (ec) {
 			LOG_WARNING_NC ("Hard-link failed; copying instead");
@@ -317,7 +376,7 @@ ReelWriter::finish ()
 			} else {
 				boost::filesystem::copy_file (video_from, video_to, ec);
 				if (ec) {
-					LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message ());
+					LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), ec.message());
 					throw FileError (ec.message(), video_from);
 				}
 			}
@@ -343,6 +402,24 @@ ReelWriter::finish ()
 
 		_sound_asset->set_file (audio_to);
 	}
+
+	if (_atmos_asset) {
+		_atmos_asset_writer->finalize ();
+		boost::filesystem::path atmos_to;
+		atmos_to /= _film->dir (_film->dcp_name());
+		string const aaf = atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary);
+		atmos_to /= aaf;
+
+		boost::system::error_code ec;
+		boost::filesystem::rename (_film->file(aaf), atmos_to, ec);
+		if (ec) {
+			throw FileError (
+				String::compose (_("could not move atmos asset into the DCP (%1)"), ec.value ()), aaf
+				);
+		}
+
+		_atmos_asset->set_file (atmos_to);
+	}
 }
 
 template <class T>
@@ -362,24 +439,9 @@ maybe_add_text (
 	shared_ptr<T> reel_asset;
 
 	if (asset) {
-		boost::filesystem::path liberation_normal;
-		try {
-			liberation_normal = shared_path() / "LiberationSans-Regular.ttf";
-			if (!boost::filesystem::exists (liberation_normal)) {
-				/* Hack for unit tests */
-				liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf";
-			}
-		} catch (boost::filesystem::filesystem_error& e) {
-
-		}
-
-		if (!boost::filesystem::exists(liberation_normal)) {
-			liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
-		}
-
 		/* Add the font to the subtitle content */
 		BOOST_FOREACH (shared_ptr<Font> j, fonts) {
-			asset->add_font (j->id(), j->file().get_value_or(liberation_normal));
+			asset->add_font (j->id(), j->file().get_value_or(default_font_file()));
 		}
 
 		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
@@ -437,6 +499,8 @@ maybe_add_text (
 shared_ptr<dcp::Reel>
 ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr<Font> > const & fonts)
 {
+	LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count);
+
 	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
 
 	shared_ptr<dcp::ReelPictureAsset> reel_picture_asset;
@@ -466,8 +530,6 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 		}
 	}
 
-	LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count);
-
 	Frame const period_duration = _period.duration().frames_round(_film->video_frame_rate());
 
 	DCPOMATIC_ASSERT (reel_picture_asset);
@@ -490,9 +552,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 		/* We have made a sound asset of our own.  Put it into the reel */
 		reel_sound_asset.reset (new dcp::ReelSoundAsset (_sound_asset, 0));
 	} else {
+		LOG_GENERAL ("no sound asset of our own; look through %1", refs.size());
 		/* We don't have a sound asset of our own; hopefully we have one to reference */
 		BOOST_FOREACH (ReferencedReelAsset j, refs) {
 			shared_ptr<dcp::ReelSoundAsset> k = dynamic_pointer_cast<dcp::ReelSoundAsset> (j.asset);
+			if (k) {
+				LOG_GENERAL ("candidate sound asset period is %1-%2", j.period.from.get(), j.period.to.get());
+			}
 			if (k && j.period == _period) {
 				reel_sound_asset = k;
 				/* If we have a hash for this asset in the CPL, assume that it is correct */
@@ -548,6 +614,10 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 		reel->add (ma);
 	}
 
+	if (_atmos_asset) {
+		reel->add (shared_ptr<dcp::ReelAtmosAsset>(new dcp::ReelAtmosAsset(_atmos_asset, 0)));
+	}
+
 	return reel;
 }
 
@@ -561,6 +631,10 @@ ReelWriter::calculate_digests (boost::function<void (float)> set_progress)
 	if (_sound_asset) {
 		_sound_asset->hash (set_progress);
 	}
+
+	if (_atmos_asset) {
+		_atmos_asset->hash (set_progress);
+	}
 }
 
 Frame
@@ -613,6 +687,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 		} else {
 			shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
 			s->set_content_title_text (_film->name ());
+			s->set_metadata (mxf_metadata());
 			if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) {
 				s->set_language (lang);
 			} else {