X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=a927770a5858e55698dc83a86df8787f2860475f;hp=da246ca0aeb25e41ec4ad221ec8edfbed225125b;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hpb=98664996b6a7ef62cbff49a174917a456f218e76

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index da246ca0a..a927770a5 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,104 +23,166 @@
 #include "cross.h"
 #include "job.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #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>
 #include <dcp/reel_subtitle_asset.h>
+#include <dcp/reel_closed_caption_asset.h>
+#include <dcp/reel_markers_asset.h>
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/raw_convert.h>
+#include <dcp/subtitle_image.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_WARNING_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_WARNING);
-#define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-
 using std::list;
 using std::string;
 using std::cout;
+using std::exception;
+using std::map;
+using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
 using dcp::Data;
 using dcp::raw_convert;
+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.
 	*/
 
-	if (_film->three_d ()) {
-		_picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
-	} else {
-		_picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
-	}
+	dcp::Standard const standard = _film->interop() ? dcp::INTEROP : dcp::SMPTE;
 
-	_picture_asset->set_size (_film->frame_size ());
+	boost::filesystem::path const asset =
+		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period);
 
-	if (_film->encrypted ()) {
-		_picture_asset->set_key (_film->key ());
-		_picture_asset->set_context_id (_film->context_id ());
-	}
+	_first_nonexistant_frame = check_existing_picture_asset (asset);
 
-	_picture_asset->set_file (
-		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period)
-		);
+	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);
+		}
 
-	job->sub (_("Checking existing image data"));
-	_first_nonexistant_frame = check_existing_picture_asset ();
 
-	_picture_asset_writer = _picture_asset->start_write (
-		_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period),
-		_film->interop() ? dcp::INTEROP : dcp::SMPTE,
-		_first_nonexistant_frame > 0
-		);
+		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->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 ())
+			new dcp::SoundAsset (dcp::Fraction(_film->video_frame_rate(), 1), _film->audio_frame_rate(), _film->audio_channels(), _film->audio_language(), standard)
 			);
 
+		_sound_asset->set_metadata (mxf_metadata());
+
 		if (_film->encrypted ()) {
 			_sound_asset->set_key (_film->key ());
 		}
 
 		DCPOMATIC_ASSERT (_film->directory());
 
+		vector<dcp::Channel> active;
+		BOOST_FOREACH (int i, _film->mapped_audio_channels()) {
+			active.push_back (static_cast<dcp::Channel>(i));
+		}
+
 		/* Write the sound asset into the film directory so that we leave the creation
 		   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->interop() ? dcp::INTEROP : dcp::SMPTE
+			active,
+			_film->contains_atmos_content()
 			);
 	}
 }
@@ -129,51 +191,27 @@ ReelWriter::ReelWriter (
 void
 ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 {
-	FILE* file = 0;
-	boost::filesystem::path info_file = _film->info_file (_period);
-
-	bool const read = boost::filesystem::exists (info_file);
-
-#ifdef DCPOMATIC_WINDOWS
-	if (read) {
-		LOG_GENERAL (
-			"Checked %1 (which exists) length is %2 perms are %3",
-			info_file, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions())
-			);
-	} else {
-		LOG_GENERAL ("Checked %1 (which does not exist)", info_file);
-	}
-#endif
-
-	if (read) {
-		file = fopen_boost (info_file, "r+b");
-	} else {
-		file = fopen_boost (info_file, "wb");
-	}
-	if (!file) {
-		throw OpenFileError (info_file, errno, read);
-	}
-	dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
-	fwrite (&info.offset, sizeof (info.offset), 1, file);
-	fwrite (&info.size, sizeof (info.size), 1, file);
-	fwrite (info.hash.c_str(), 1, info.hash.size(), file);
-	fclose (file);
+	shared_ptr<InfoFileHandle> handle = _film->info_file_handle(_period, false);
+	dcpomatic_fseek (handle->get(), frame_info_position(frame, eyes), SEEK_SET);
+	checked_fwrite (&info.offset, sizeof(info.offset), handle->get(), handle->file());
+	checked_fwrite (&info.size, sizeof (info.size), handle->get(), handle->file());
+	checked_fwrite (info.hash.c_str(), info.hash.size(), handle->get(), handle->file());
 }
 
 dcp::FrameInfo
-ReelWriter::read_frame_info (FILE* file, Frame frame, Eyes eyes) const
+ReelWriter::read_frame_info (shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const
 {
-	dcp::FrameInfo info;
-	dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
-	fread (&info.offset, sizeof (info.offset), 1, file);
-	fread (&info.size, sizeof (info.size), 1, file);
+	dcp::FrameInfo frame_info;
+	dcpomatic_fseek (info->get(), frame_info_position(frame, eyes), SEEK_SET);
+	checked_fread (&frame_info.offset, sizeof(frame_info.offset), info->get(), info->file());
+	checked_fread (&frame_info.size, sizeof(frame_info.size), info->get(), info->file());
 
 	char hash_buffer[33];
-	fread (hash_buffer, 1, 32, file);
+	checked_fread (hash_buffer, 32, info->get(), info->file());
 	hash_buffer[32] = '\0';
-	info.hash = hash_buffer;
+	frame_info.hash = hash_buffer;
 
-	return info;
+	return frame_info;
 }
 
 long
@@ -194,19 +232,12 @@ 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) {
-		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"));
 	}
 
 	/* Try to open the existing asset */
@@ -218,17 +249,20 @@ ReelWriter::check_existing_picture_asset ()
 		LOG_GENERAL ("Opened existing asset at %1", asset.string());
 	}
 
-	/* Offset of the last dcp::FrameInfo in the info file */
-	int const n = (boost::filesystem::file_size (_film->info_file(_period)) / _info_size) - 1;
-	LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size (_film->info_file(_period)), _info_size);
+	shared_ptr<InfoFileHandle> info_file;
 
-	FILE* info_file = fopen_boost (_film->info_file(_period), "rb");
-	if (!info_file) {
+	try {
+		info_file = _film->info_file_handle (_period, true);
+	} catch (OpenFileError &) {
 		LOG_GENERAL_NC ("Could not open film info file");
 		fclose (asset_file);
 		return 0;
 	}
 
+	/* Offset of the last dcp::FrameInfo in the info file */
+	int const n = (boost::filesystem::file_size(info_file->file()) / _info_size) - 1;
+	LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, boost::filesystem::file_size(info_file->file()), _info_size);
+
 	Frame first_nonexistant_frame;
 	if (_film->three_d ()) {
 		/* Start looking at the last left frame */
@@ -251,45 +285,70 @@ ReelWriter::check_existing_picture_asset ()
 	LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame);
 
 	fclose (asset_file);
-	fclose (info_file);
 
 	return first_nonexistant_frame;
 }
 
 void
-ReelWriter::write (optional<Data> encoded, Frame frame, Eyes eyes)
+ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 {
-	dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data().get (), encoded->size());
+	if (!_picture_asset_writer) {
+		/* We're not writing any data */
+		return;
+	}
+
+	dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size());
 	write_frame_info (frame, eyes, fin);
 	_last_written[eyes] = encoded;
-	_last_written_video_frame = frame;
-	_last_written_eyes = eyes;
 }
 
+
+void
+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 (Frame frame, Eyes eyes, int size)
+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]->data(),
 		_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 ();
@@ -307,15 +366,30 @@ 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");
-			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 ());
-				throw FileError (ec.message(), video_from);
+			shared_ptr<Job> job = _job.lock ();
+			if (job) {
+				job->sub (_("Copying video file into DCP"));
+				try {
+					copy_in_bits (video_from, video_to, bind(&Job::set_progress, job.get(), _1, false));
+				} catch (exception& e) {
+					LOG_ERROR ("Failed to copy video file from %1 to %2 (%3)", video_from.string(), video_to.string(), e.what());
+					throw FileError (e.what(), video_from);
+				}
+			} 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());
+					throw FileError (ec.message(), video_from);
+				}
 			}
 		}
 
@@ -339,11 +413,105 @@ 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>
+shared_ptr<T>
+maybe_add_text (
+	shared_ptr<dcp::SubtitleAsset> asset,
+	int64_t picture_duration,
+	shared_ptr<dcp::Reel> reel,
+	list<ReferencedReelAsset> const & refs,
+	list<shared_ptr<Font> > const & fonts,
+	shared_ptr<const Film> film,
+	DCPTimePeriod period
+	)
+{
+	Frame const period_duration = period.duration().frames_round(film->video_frame_rate());
+
+	shared_ptr<T> reel_asset;
+
+	if (asset) {
+		/* Add the font to the subtitle content */
+		BOOST_FOREACH (shared_ptr<Font> j, fonts) {
+			asset->add_font (j->id(), j->file().get_value_or(default_font_file()));
+		}
+
+		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
+			boost::filesystem::path directory = film->dir (film->dcp_name ()) / asset->id ();
+			boost::filesystem::create_directories (directory);
+			asset->write (directory / ("sub_" + asset->id() + ".xml"));
+		} else {
+			/* All our assets should be the same length; use the picture asset length here
+			   as a reference to set the subtitle one.  We'll use the duration rather than
+			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+			   just interested in its presentation length.
+			*/
+			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(asset)->set_intrinsic_duration (picture_duration);
+
+			asset->write (
+				film->dir(film->dcp_name()) / ("sub_" + asset->id() + ".mxf")
+				);
+		}
+
+		reel_asset.reset (
+			new T (
+				asset,
+				dcp::Fraction (film->video_frame_rate(), 1),
+				picture_duration,
+				0
+				)
+			);
+	} else {
+		/* We don't have a subtitle asset of our own; hopefully we have one to reference */
+		BOOST_FOREACH (ReferencedReelAsset j, refs) {
+			shared_ptr<T> k = dynamic_pointer_cast<T> (j.asset);
+			if (k && j.period == period) {
+				reel_asset = k;
+				/* If we have a hash for this asset in the CPL, assume that it is correct */
+				if (k->hash()) {
+					k->asset_ref()->set_hash (k->hash().get());
+				}
+			}
+		}
+	}
+
+	if (reel_asset) {
+		if (reel_asset->actual_duration() != period_duration) {
+			throw ProgrammingError (
+				__FILE__, __LINE__,
+				String::compose ("%1 vs %2", reel_asset->actual_duration(), period_duration)
+				);
+		}
+		reel->add (reel_asset);
+	}
+
+	return reel_asset;
 }
 
 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;
@@ -373,15 +541,13 @@ 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);
 	if (reel_picture_asset->duration() != period_duration) {
 		throw ProgrammingError (
 			__FILE__, __LINE__,
-			String::compose ("%1 vs %2", reel_picture_asset->duration(), period_duration)
+			String::compose ("%1 vs %2", reel_picture_asset->actual_duration(), period_duration)
 			);
 	}
 	reel->add (reel_picture_asset);
@@ -397,9 +563,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 */
@@ -411,96 +581,53 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 	}
 
 	DCPOMATIC_ASSERT (reel_sound_asset);
-	if (reel_sound_asset->duration() != period_duration) {
+	if (reel_sound_asset->actual_duration() != period_duration) {
 		LOG_ERROR (
 			"Reel sound asset has length %1 but reel period is %2",
-			reel_sound_asset->duration(),
+			reel_sound_asset->actual_duration(),
 			period_duration
 			);
-		if (reel_sound_asset->duration() != period_duration) {
+		if (reel_sound_asset->actual_duration() != period_duration) {
 			throw ProgrammingError (
 				__FILE__, __LINE__,
-				String::compose ("%1 vs %2", reel_sound_asset->duration(), period_duration)
+				String::compose ("%1 vs %2", reel_sound_asset->actual_duration(), period_duration)
 				);
 		}
 
 	}
 	reel->add (reel_sound_asset);
 
-	shared_ptr<dcp::ReelSubtitleAsset> reel_subtitle_asset;
-
-	if (_subtitle_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 all the fonts to the subtitle content */
-		BOOST_FOREACH (shared_ptr<Font> j, fonts) {
-			_subtitle_asset->add_font (j->id(), j->file(FontFiles::NORMAL).get_value_or(liberation_normal));
-		}
-
-		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (_subtitle_asset)) {
-			boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id ();
-			boost::filesystem::create_directories (directory);
-			_subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml"));
-		} else {
-
-			/* All our assets should be the same length; use the picture asset length here
-			   as a reference to set the subtitle one.  We'll use the duration rather than
-			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
-			   just interested in its presentation length.
-			*/
-			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
-				reel_picture_asset->duration ()
-				);
+	maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period);
+	for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
+		shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+			i->second, reel_picture_asset->actual_duration(), reel, refs, fonts, _film, _period
+			);
+		a->set_annotation_text (i->first.name);
+		a->set_language (i->first.language);
+	}
 
-			_subtitle_asset->write (
-				_film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf")
-				);
+	Film::Markers markers = _film->markers ();
+	_film->add_ffoc_lfoc (markers);
+	Film::Markers reel_markers;
+	for (Film::Markers::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+		if (_period.contains(i->second)) {
+			reel_markers[i->first] = i->second;
 		}
+	}
 
-		reel_subtitle_asset.reset (
-			new dcp::ReelSubtitleAsset (
-				_subtitle_asset,
-				dcp::Fraction (_film->video_frame_rate(), 1),
-				reel_picture_asset->duration(),
-				0
-				)
-			);
-	} else {
-		/* We don't have a subtitle asset of our own; hopefully we have one to reference */
-		BOOST_FOREACH (ReferencedReelAsset j, refs) {
-			shared_ptr<dcp::ReelSubtitleAsset> k = dynamic_pointer_cast<dcp::ReelSubtitleAsset> (j.asset);
-			if (k && j.period == _period) {
-				reel_subtitle_asset = k;
-				/* If we have a hash for this asset in the CPL, assume that it is correct */
-				if (k->hash()) {
-					k->asset_ref()->set_hash (k->hash().get());
-				}
-			}
+	if (!reel_markers.empty ()) {
+		shared_ptr<dcp::ReelMarkersAsset> ma (new dcp::ReelMarkersAsset(dcp::Fraction(_film->video_frame_rate(), 1), 0));
+		for (map<dcp::Marker, DCPTime>::const_iterator i = reel_markers.begin(); i != reel_markers.end(); ++i) {
+			int h, m, s, f;
+			DCPTime relative = i->second - _period.from;
+			relative.split (_film->video_frame_rate(), h, m, s, f);
+			ma->set (i->first, dcp::Time(h, m, s, f, _film->video_frame_rate()));
 		}
+		reel->add (ma);
 	}
 
-	if (reel_subtitle_asset) {
-		if (reel_subtitle_asset->duration() != period_duration) {
-			throw ProgrammingError (
-				__FILE__, __LINE__,
-				String::compose ("%1 vs %2", reel_subtitle_asset->duration(), period_duration)
-				);
-		}
-		reel->add (reel_subtitle_asset);
+	if (_atmos_asset) {
+		reel->add (shared_ptr<dcp::ReelAtmosAsset>(new dcp::ReelAtmosAsset(_atmos_asset, 0)));
 	}
 
 	return reel;
@@ -516,6 +643,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
@@ -537,23 +668,43 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio)
 }
 
 void
-ReelWriter::write (PlayerSubtitles subs)
+ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (!_subtitle_asset) {
-		string lang = _film->subtitle_language ();
-		if (lang.empty ()) {
-			lang = "Unknown";
-		}
+	shared_ptr<dcp::SubtitleAsset> asset;
+
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		asset = _subtitle_asset;
+		break;
+	case TEXT_CLOSED_CAPTION:
+		DCPOMATIC_ASSERT (track);
+		asset = _closed_caption_assets[*track];
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	if (!asset) {
+		vector<dcp::LanguageTag> lang = _film->subtitle_languages ();
 		if (_film->interop ()) {
 			shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
 			s->set_movie_title (_film->name ());
-			s->set_language (lang);
+			if (type == TEXT_OPEN_SUBTITLE) {
+				s->set_language (lang.empty() ? "Unknown" : lang.front().to_string());
+			} else {
+				s->set_language (track->language);
+			}
 			s->set_reel_number (raw_convert<string> (_reel_index + 1));
-			_subtitle_asset = s;
+			asset = s;
 		} else {
 			shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
 			s->set_content_title_text (_film->name ());
-			s->set_language (lang);
+			s->set_metadata (mxf_metadata());
+			if (type == TEXT_OPEN_SUBTITLE && !lang.empty()) {
+				s->set_language (lang.front().to_string());
+			} else {
+				s->set_language (track->language);
+			}
 			s->set_edit_rate (dcp::Fraction (_film->video_frame_rate (), 1));
 			s->set_reel_number (_reel_index + 1);
 			s->set_time_code_rate (_film->video_frame_rate ());
@@ -561,19 +712,46 @@ ReelWriter::write (PlayerSubtitles subs)
 			if (_film->encrypted ()) {
 				s->set_key (_film->key ());
 			}
-			_subtitle_asset = s;
+			asset = s;
 		}
 	}
 
-	BOOST_FOREACH (SubtitleString i, subs.text) {
+	switch (type) {
+	case TEXT_OPEN_SUBTITLE:
+		_subtitle_asset = asset;
+		break;
+	case TEXT_CLOSED_CAPTION:
+		DCPOMATIC_ASSERT (track);
+		_closed_caption_assets[*track] = asset;
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
+	}
+
+	BOOST_FOREACH (StringText i, subs.string) {
+		/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
 		i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
 		i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
-		_subtitle_asset->add (i);
+		asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+	}
+
+	BOOST_FOREACH (BitmapText i, subs.bitmap) {
+		asset->add (
+			shared_ptr<dcp::Subtitle>(
+				new dcp::SubtitleImage(
+					i.image->as_png(),
+					dcp::Time(period.from.seconds() - _period.from.seconds(), _film->video_frame_rate()),
+					dcp::Time(period.to.seconds() - _period.from.seconds(), _film->video_frame_rate()),
+					i.rectangle.x, dcp::HALIGN_LEFT, i.rectangle.y, dcp::VALIGN_TOP,
+					dcp::Time(), dcp::Time()
+					)
+				)
+			);
 	}
 }
 
 bool
-ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const
+ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr<InfoFileHandle> info_file, Frame frame) const
 {
 	LOG_GENERAL ("Checking existing picture frame %1", frame);
 
@@ -586,15 +764,15 @@ ReelWriter::existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame
 
 	/* Read the data from the asset and hash it */
 	dcpomatic_fseek (asset_file, info.offset, SEEK_SET);
-	Data data (info.size);
-	size_t const read = fread (data.data().get(), 1, data.size(), asset_file);
+	ArrayData data (info.size);
+	size_t const read = fread (data.data(), 1, data.size(), asset_file);
 	LOG_GENERAL ("Read %1 bytes of asset data; wanted %2", read, info.size);
 	if (read != static_cast<size_t> (data.size ())) {
 		LOG_GENERAL ("Existing frame %1 is incomplete", frame);
 		ok = false;
 	} else {
 		Digester digester;
-		digester.add (data.data().get(), data.size());
+		digester.add (data.data(), data.size());
 		LOG_GENERAL ("Hash %1 vs %2", digester.get(), info.hash);
 		if (digester.get() != info.hash) {
 			LOG_GENERAL ("Existing frame %1 failed hash check", frame);