X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=1b33cae852eedcbb1ed5330d9e20bf52bc77bd03;hb=HEAD;hp=8ced98a114e81c4feede52fe24e89ef35b240ad0;hpb=3239ce7c2cde98a6d70777f7e408b356a5f01a94;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 8ced98a11..1b33cae85 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -18,68 +18,77 @@
 
 */
 
-#include "reel_writer.h"
-#include "film.h"
+
+#include "audio_buffers.h"
+#include "compose.hpp"
+#include "config.h"
+#include "constants.h"
 #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 "film.h"
+#include "film_util.h"
 #include "image.h"
+#include "image_png.h"
+#include "job.h"
+#include "log.h"
+#include "reel_writer.h"
 #include <dcp/atmos_asset.h>
 #include <dcp/atmos_asset_writer.h>
+#include <dcp/certificate_chain.h>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/filesystem.h>
+#include <dcp/interop_subtitle_asset.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/raw_convert.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
+#include <dcp/reel_interop_closed_caption_asset.h>
+#include <dcp/reel_interop_subtitle_asset.h>
+#include <dcp/reel_markers_asset.h>
 #include <dcp/reel_mono_picture_asset.h>
-#include <dcp/reel_stereo_picture_asset.h>
+#include <dcp/reel_smpte_closed_caption_asset.h>
+#include <dcp/reel_smpte_subtitle_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/reel_stereo_picture_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
-#include <dcp/raw_convert.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_writer.h>
+#include <dcp/stereo_picture_asset.h>
 #include <dcp/subtitle_image.h>
-#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
-using std::list;
-using std::string;
-using std::cout;
+
+using std::dynamic_pointer_cast;
 using std::exception;
+using std::list;
+using std::make_shared;
 using std::map;
+using std::set;
+using std::shared_ptr;
+using std::string;
 using std::vector;
-using boost::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
-using boost::weak_ptr;
 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();
+	auto config = Config::instance();
 	if (!config->dcp_company_name().empty()) {
 		meta.company_name = config->dcp_company_name ();
 	}
@@ -92,6 +101,7 @@ mxf_metadata ()
 	return meta;
 }
 
+
 /** @param job Related job, or 0.
  *  @param text_only true to enable a special mode where the writer will expect only subtitles and closed captions to be written
  *  (no picture nor sound) and not give errors in that case.  This is used by the hints system to check the potential sizes of
@@ -107,34 +117,35 @@ ReelWriter::ReelWriter (
 	, _content_summary (film()->content_summary(period))
 	, _job (job)
 	, _text_only (text_only)
+	, _font_metrics(film()->frame_size().height)
 {
 	/* 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;
+	auto const standard = film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE;
 
 	boost::filesystem::path const asset =
 		film()->internal_video_asset_dir() / film()->internal_video_asset_filename(_period);
 
-	_first_nonexistant_frame = check_existing_picture_asset (asset);
+	_first_nonexistent_frame = check_existing_picture_asset (asset);
 
-	if (_first_nonexistant_frame < period.duration().frames_round(film()->video_frame_rate())) {
+	if (_first_nonexistent_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 (dcp::filesystem::exists(asset) && dcp::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");
+				dcp::filesystem::copy_file(asset, asset.string() + ".tmp");
 			}
-			boost::filesystem::remove (asset);
-			boost::filesystem::rename (asset.string() + ".tmp", asset);
+			dcp::filesystem::remove(asset);
+			dcp::filesystem::rename(asset.string() + ".tmp", asset);
 		}
 
 
@@ -153,20 +164,25 @@ ReelWriter::ReelWriter (
 		}
 
 		_picture_asset->set_file (asset);
-		_picture_asset_writer = _picture_asset->start_write (asset, _first_nonexistant_frame > 0);
-	} else {
+		_picture_asset_writer = _picture_asset->start_write(asset, _first_nonexistent_frame > 0 ? dcp::PictureAsset::Behaviour::OVERWRITE_EXISTING : dcp::PictureAsset::Behaviour::MAKE_NEW);
+	} else if (!text_only) {
 		/* 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));
+			_picture_asset = make_shared<dcp::StereoPictureAsset>(asset);
 		} else {
-			_picture_asset.reset (new dcp::MonoPictureAsset(asset));
+			_picture_asset = make_shared<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(), film()->audio_language(), standard)
+		auto lang = film()->audio_language();
+		_sound_asset = make_shared<dcp::SoundAsset> (
+			dcp::Fraction(film()->video_frame_rate(), 1),
+			film()->audio_frame_rate(),
+			film()->audio_channels(),
+			lang ? *lang : dcp::LanguageTag("en-US"),
+			standard
 			);
 
 		_sound_asset->set_metadata (mxf_metadata());
@@ -177,9 +193,11 @@ ReelWriter::ReelWriter (
 
 		DCPOMATIC_ASSERT (film()->directory());
 
-		vector<dcp::Channel> active;
-		BOOST_FOREACH (int i, film()->mapped_audio_channels()) {
-			active.push_back (static_cast<dcp::Channel>(i));
+		std::vector<dcp::Channel> extra_active_channels;
+		for (auto channel: std::vector<dcp::Channel>{dcp::Channel::HI, dcp::Channel::VI, dcp::Channel::BSL, dcp::Channel::BSR}) {
+			if (channel_is_mapped(film(), channel)) {
+				extra_active_channels.push_back(channel);
+			}
 		}
 
 		/* Write the sound asset into the film directory so that we leave the creation
@@ -187,48 +205,54 @@ ReelWriter::ReelWriter (
 		*/
 		_sound_asset_writer = _sound_asset->start_write (
 			film()->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
-			active,
-			film()->contains_atmos_content()
+			extra_active_channels,
+			film()->contains_atmos_content() ? dcp::SoundAsset::AtmosSync::ENABLED : dcp::SoundAsset::AtmosSync::DISABLED,
+			film()->limit_to_smpte_bv20() ? dcp::SoundAsset::MCASubDescriptors::DISABLED : dcp::SoundAsset::MCASubDescriptors::ENABLED
 			);
 	}
+
+	_default_font = dcp::ArrayData(default_font_file());
 }
 
+
 /** @param frame reel-relative frame */
 void
 ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 {
-	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());
+	auto handle = film()->info_file_handle(_period, false);
+	handle->get().seek(frame_info_position(frame, eyes), SEEK_SET);
+	handle->get().checked_write(&info.offset, sizeof(info.offset));
+	handle->get().checked_write(&info.size, sizeof(info.size));
+	handle->get().checked_write(info.hash.c_str(), info.hash.size());
 }
 
+
 dcp::FrameInfo
 ReelWriter::read_frame_info (shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const
 {
 	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());
+	info->get().seek(frame_info_position(frame, eyes), SEEK_SET);
+	info->get().checked_read(&frame_info.offset, sizeof(frame_info.offset));
+	info->get().checked_read(&frame_info.size, sizeof(frame_info.size));
 
 	char hash_buffer[33];
-	checked_fread (hash_buffer, 32, info->get(), info->file());
+	info->get().checked_read(hash_buffer, 32);
 	hash_buffer[32] = '\0';
 	frame_info.hash = hash_buffer;
 
 	return frame_info;
 }
 
+
 long
 ReelWriter::frame_info_position (Frame frame, Eyes eyes) const
 {
 	switch (eyes) {
-	case EYES_BOTH:
+	case Eyes::BOTH:
 		return frame * _info_size;
-	case EYES_LEFT:
+	case Eyes::LEFT:
 		return frame * _info_size * 2;
-	case EYES_RIGHT:
+	case Eyes::RIGHT:
 		return frame * _info_size * 2 + _info_size;
 	default:
 		DCPOMATIC_ASSERT (false);
@@ -237,17 +261,18 @@ ReelWriter::frame_info_position (Frame frame, Eyes eyes) const
 	DCPOMATIC_ASSERT (false);
 }
 
+
 Frame
 ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 {
-	shared_ptr<Job> job = _job.lock ();
+	auto job = _job.lock ();
 
 	if (job) {
 		job->sub (_("Checking existing image data"));
 	}
 
 	/* Try to open the existing asset */
-	FILE* asset_file = fopen_boost (asset, "rb");
+	dcp::File asset_file(asset, "rb");
 	if (!asset_file) {
 		LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", asset.string(), errno);
 		return 0;
@@ -261,40 +286,38 @@ ReelWriter::check_existing_picture_asset (boost::filesystem::path asset)
 		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);
+	int const n = (dcp::filesystem::file_size(info_file->get().path()) / _info_size) - 1;
+	LOG_GENERAL ("The last FI is %1; info file is %2, info size %3", n, dcp::filesystem::file_size(info_file->get().path()), _info_size);
 
-	Frame first_nonexistant_frame;
+	Frame first_nonexistent_frame;
 	if (film()->three_d()) {
 		/* Start looking at the last left frame */
-		first_nonexistant_frame = n / 2;
+		first_nonexistent_frame = n / 2;
 	} else {
-		first_nonexistant_frame = n;
+		first_nonexistent_frame = n;
 	}
 
-	while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistant_frame) && first_nonexistant_frame > 0) {
-		--first_nonexistant_frame;
+	while (!existing_picture_frame_ok(asset_file, info_file, first_nonexistent_frame) && first_nonexistent_frame > 0) {
+		--first_nonexistent_frame;
 	}
 
-	if (!film()->three_d() && first_nonexistant_frame > 0) {
+	if (!film()->three_d() && first_nonexistent_frame > 0) {
 		/* If we are doing 3D we might have found a good L frame with no R, so only
 		   do this if we're in 2D and we've just found a good B(oth) frame.
 		*/
-		++first_nonexistant_frame;
+		++first_nonexistent_frame;
 	}
 
-	LOG_GENERAL ("Proceeding with first nonexistant frame %1", first_nonexistant_frame);
-
-	fclose (asset_file);
+	LOG_GENERAL ("Proceeding with first nonexistent frame %1", first_nonexistent_frame);
 
-	return first_nonexistant_frame;
+	return first_nonexistent_frame;
 }
 
+
 void
 ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 {
@@ -303,7 +326,7 @@ ReelWriter::write (shared_ptr<const Data> encoded, Frame frame, Eyes eyes)
 		return;
 	}
 
-	dcp::FrameInfo fin = _picture_asset_writer->write (encoded->data(), encoded->size());
+	auto fin = _picture_asset_writer->write (encoded->data(), encoded->size());
 	write_frame_info (frame, eyes, fin);
 	_last_written[eyes] = encoded;
 }
@@ -336,6 +359,7 @@ ReelWriter::fake_write (int size)
 	_picture_asset_writer->fake_write (size);
 }
 
+
 void
 ReelWriter::repeat_write (Frame frame, Eyes eyes)
 {
@@ -344,13 +368,11 @@ ReelWriter::repeat_write (Frame frame, Eyes eyes)
 		return;
 	}
 
-	dcp::FrameInfo fin = _picture_asset_writer->write (
-		_last_written[eyes]->data(),
-		_last_written[eyes]->size()
-		);
+	auto fin = _picture_asset_writer->write(_last_written[eyes]->data(), _last_written[eyes]->size());
 	write_frame_info (frame, eyes, fin);
 }
 
+
 void
 ReelWriter::finish (boost::filesystem::path output_dcp)
 {
@@ -375,12 +397,12 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 		   changing any video.
 		*/
 		boost::system::error_code ec;
-		boost::filesystem::remove (video_to, ec);
+		dcp::filesystem::remove(video_to, ec);
 
-		boost::filesystem::create_hard_link (video_from, video_to, ec);
+		dcp::filesystem::create_hard_link(video_from, video_to, ec);
 		if (ec) {
-			LOG_WARNING_NC ("Hard-link failed; copying instead");
-			shared_ptr<Job> job = _job.lock ();
+			LOG_WARNING("Hard-link failed (%1); copying instead", error_details(ec));
+			auto job = _job.lock ();
 			if (job) {
 				job->sub (_("Copying video file into DCP"));
 				try {
@@ -390,9 +412,9 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 					throw FileError (e.what(), video_from);
 				}
 			} else {
-				boost::filesystem::copy_file (video_from, video_to, ec);
+				dcp::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(), error_details(ec));
 					throw FileError (ec.message(), video_from);
 				}
 			}
@@ -404,14 +426,14 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 	/* Move the audio asset into the DCP */
 	if (_sound_asset) {
 		boost::filesystem::path audio_to = output_dcp;
-		string const aaf = audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary);
+		auto const aaf = audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary);
 		audio_to /= aaf;
 
 		boost::system::error_code ec;
-		boost::filesystem::rename (film()->file(aaf), audio_to, ec);
+		dcp::filesystem::rename(film()->file(aaf), audio_to, ec);
 		if (ec) {
 			throw FileError (
-				String::compose (_("could not move audio asset into the DCP (%1)"), ec.value ()), aaf
+				String::compose(_("could not move audio asset into the DCP (%1)"), error_details(ec)), aaf
 				);
 		}
 
@@ -421,14 +443,14 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 	if (_atmos_asset) {
 		_atmos_asset_writer->finalize ();
 		boost::filesystem::path atmos_to = output_dcp;
-		string const aaf = atmos_asset_filename (_atmos_asset, _reel_index, _reel_count, _content_summary);
+		auto 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);
+		dcp::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
+				String::compose(_("could not move atmos asset into the DCP (%1)"), error_details(ec)), aaf
 				);
 		}
 
@@ -436,14 +458,20 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 	}
 }
 
-template <class T>
-shared_ptr<T>
+
+/** Try to make a ReelAsset for a subtitles or closed captions in a given period in the DCP.
+ *  A SubtitleAsset can be provided, or we will use one from @ref refs if not.
+ */
+template <class Interop, class SMPTE, class Result>
+shared_ptr<Result>
 maybe_add_text (
 	shared_ptr<dcp::SubtitleAsset> asset,
 	int64_t picture_duration,
 	shared_ptr<dcp::Reel> reel,
+	int reel_index,
+	int reel_count,
+	optional<string> content_summary,
 	list<ReferencedReelAsset> const & refs,
-	list<shared_ptr<Font> > const & fonts,
 	shared_ptr<const Film> film,
 	DCPTimePeriod period,
 	boost::filesystem::path output_dcp,
@@ -452,43 +480,41 @@ maybe_add_text (
 {
 	Frame const period_duration = period.duration().frames_round(film->video_frame_rate());
 
-	shared_ptr<T> reel_asset;
+	shared_ptr<Result> 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 = output_dcp / asset->id ();
-			boost::filesystem::create_directories (directory);
-			asset->write (directory / ("sub_" + asset->id() + ".xml"));
-		} else {
+		if (auto interop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(asset)) {
+			auto directory = output_dcp / interop->id ();
+			dcp::filesystem::create_directories(directory);
+			interop->write (directory / subtitle_asset_filename(asset, reel_index, reel_count, content_summary, ".xml"));
+			reel_asset = make_shared<Interop> (
+				interop,
+				dcp::Fraction(film->video_frame_rate(), 1),
+				picture_duration,
+				0
+				);
+		} else if (auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(asset)) {
 			/* 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 (
-				output_dcp / ("sub_" + asset->id() + ".mxf")
+			smpte->set_intrinsic_duration(picture_duration);
+			smpte->write (
+				output_dcp / subtitle_asset_filename(asset, reel_index, reel_count, content_summary, ".mxf")
 				);
-		}
-
-		reel_asset.reset (
-			new T (
-				asset,
-				dcp::Fraction (film->video_frame_rate(), 1),
+			reel_asset = make_shared<SMPTE> (
+				smpte,
+				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);
+		for (auto j: refs) {
+			auto k = dynamic_pointer_cast<Result> (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 */
@@ -520,20 +546,20 @@ ReelWriter::create_reel_picture (shared_ptr<dcp::Reel> reel, list<ReferencedReel
 
 	if (_picture_asset) {
 		/* We have made a picture asset of our own.  Put it into the reel */
-		shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset);
+		auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset);
 		if (mono) {
-			reel_asset.reset (new dcp::ReelMonoPictureAsset (mono, 0));
+			reel_asset = make_shared<dcp::ReelMonoPictureAsset>(mono, 0);
 		}
 
-		shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (_picture_asset);
+		auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (_picture_asset);
 		if (stereo) {
-			reel_asset.reset (new dcp::ReelStereoPictureAsset (stereo, 0));
+			reel_asset = make_shared<dcp::ReelStereoPictureAsset>(stereo, 0);
 		}
 	} else {
 		LOG_GENERAL ("no picture asset of our own; look through %1", refs.size());
 		/* We don't have a picture asset of our own; hopefully we have one to reference */
-		BOOST_FOREACH (ReferencedReelAsset j, refs) {
-			shared_ptr<dcp::ReelPictureAsset> k = dynamic_pointer_cast<dcp::ReelPictureAsset> (j.asset);
+		for (auto j: refs) {
+			auto k = dynamic_pointer_cast<dcp::ReelPictureAsset> (j.asset);
 			if (k) {
 				LOG_GENERAL ("candidate picture asset period is %1-%2", j.period.from.get(), j.period.to.get());
 			}
@@ -570,12 +596,12 @@ ReelWriter::create_reel_sound (shared_ptr<dcp::Reel> reel, list<ReferencedReelAs
 
 	if (_sound_asset) {
 		/* We have made a sound asset of our own.  Put it into the reel */
-		reel_asset.reset (new dcp::ReelSoundAsset(_sound_asset, 0));
+		reel_asset = make_shared<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);
+		for (auto j: refs) {
+			auto 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());
 			}
@@ -589,7 +615,7 @@ ReelWriter::create_reel_sound (shared_ptr<dcp::Reel> reel, list<ReferencedReelAs
 		}
 	}
 
-	Frame const period_duration = _period.duration().frames_round(film()->video_frame_rate());
+	auto const period_duration = _period.duration().frames_round(film()->video_frame_rate());
 
 	DCPOMATIC_ASSERT (reel_asset);
 	if (reel_asset->actual_duration() != period_duration) {
@@ -614,64 +640,115 @@ void
 ReelWriter::create_reel_text (
 	shared_ptr<dcp::Reel> reel,
 	list<ReferencedReelAsset> const & refs,
-	list<shared_ptr<Font> > const& fonts,
 	int64_t duration,
-	boost::filesystem::path output_dcp
+	boost::filesystem::path output_dcp,
+	bool ensure_subtitles,
+	set<DCPTextTrack> ensure_closed_captions
 	) const
 {
-	shared_ptr<dcp::ReelSubtitleAsset> subtitle = maybe_add_text<dcp::ReelSubtitleAsset> (
-		_subtitle_asset, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only
+	auto subtitle = maybe_add_text<dcp::ReelInteropSubtitleAsset, dcp::ReelSMPTESubtitleAsset, dcp::ReelSubtitleAsset> (
+		_subtitle_asset, duration, reel, _reel_index, _reel_count, _content_summary, refs, film(), _period, output_dcp, _text_only
 		);
-	if (subtitle && !film()->subtitle_languages().empty()) {
-		subtitle->set_language (film()->subtitle_languages().front());
+
+	if (!subtitle && ensure_subtitles) {
+		/* We had no subtitle asset, but we've been asked to make sure there is one */
+		subtitle = maybe_add_text<dcp::ReelInteropSubtitleAsset, dcp::ReelSMPTESubtitleAsset, dcp::ReelSubtitleAsset> (
+			empty_text_asset(TextType::OPEN_SUBTITLE, optional<DCPTextTrack>(), true),
+			duration,
+			reel,
+			_reel_index,
+			_reel_count,
+			_content_summary,
+			refs,
+			film(),
+			_period,
+			output_dcp,
+			_text_only
+			);
 	}
 
-	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, duration, reel, refs, fonts, film(), _period, output_dcp, _text_only
+	if (subtitle) {
+		/* We have a subtitle asset that we either made or are referencing */
+		if (auto main_language = film()->subtitle_languages().first) {
+			subtitle->set_language (*main_language);
+		}
+	}
+
+	for (auto const& i: _closed_caption_assets) {
+		auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> (
+			i.second, duration, reel, _reel_index, _reel_count, _content_summary, refs, film(), _period, output_dcp, _text_only
 			);
-		if (a) {
-			a->set_annotation_text (i->first.name);
-			if (!i->first.language.empty()) {
-				a->set_language (dcp::LanguageTag(i->first.language));
-			}
+		DCPOMATIC_ASSERT (a);
+		a->set_annotation_text (i.first.name);
+		if (i.first.language) {
+			a->set_language (i.first.language.get());
 		}
+
+		ensure_closed_captions.erase (i.first);
 	}
-}
 
+	/* Make empty tracks for anything we've been asked to ensure but that we haven't added */
+	for (auto i: ensure_closed_captions) {
+		auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> (
+			empty_text_asset(TextType::CLOSED_CAPTION, i, true),
+			duration,
+			reel,
+			_reel_index,
+			_reel_count,
+			_content_summary,
+			refs,
+			film(),
+			_period,
+			output_dcp,
+			_text_only
+			);
+		DCPOMATIC_ASSERT (a);
+		a->set_annotation_text (i.name);
+		if (i.language) {
+			a->set_language (i.language.get());
+		}
+	}
+}
 
 
 void
 ReelWriter::create_reel_markers (shared_ptr<dcp::Reel> reel) const
 {
-	Film::Markers markers = film()->markers();
+	auto 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;
+	for (auto const& i: markers) {
+		if (_period.contains(i.second)) {
+			reel_markers[i.first] = i.second;
 		}
 	}
 
 	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()));
+		auto ma = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration());
+		for (auto const& i: reel_markers) {
+			DCPTime relative = i.second - _period.from;
+			auto hmsf = relative.split (film()->video_frame_rate());
+			ma->set (i.first, dcp::Time(hmsf.h, hmsf.m, hmsf.s, hmsf.f, film()->video_frame_rate()));
 		}
 		reel->add (ma);
 	}
 }
 
 
+/** @param ensure_subtitles true to make sure the reel has a subtitle asset.
+ *  @param ensure_closed_captions make sure the reel has these closed caption tracks.
+ */
 shared_ptr<dcp::Reel>
-ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr<Font> > const & fonts, boost::filesystem::path output_dcp)
+ReelWriter::create_reel (
+	list<ReferencedReelAsset> const & refs,
+	boost::filesystem::path output_dcp,
+	bool ensure_subtitles,
+	set<DCPTextTrack> ensure_closed_captions
+	)
 {
 	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());
+	auto reel = make_shared<dcp::Reel>();
 
 	/* This is a bit of a hack; in the strange `_text_only' mode we have no picture, so we don't know
 	 * how long the subtitle / CCAP assets should be.  However, since we're only writing them to see
@@ -679,37 +756,63 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 	 */
 	int64_t duration = 0;
 	if (!_text_only) {
-		shared_ptr<dcp::ReelPictureAsset> reel_picture_asset = create_reel_picture (reel, refs);
+		auto reel_picture_asset = create_reel_picture (reel, refs);
 		duration = reel_picture_asset->actual_duration ();
 		create_reel_sound (reel, refs);
-		create_reel_markers (reel);
+		if (!film()->interop()) {
+			create_reel_markers(reel);
+		}
 	}
 
-	create_reel_text (reel, refs, fonts, duration, output_dcp);
+	create_reel_text(reel, refs, duration, output_dcp, ensure_subtitles, ensure_closed_captions);
 
 	if (_atmos_asset) {
-		reel->add (shared_ptr<dcp::ReelAtmosAsset>(new dcp::ReelAtmosAsset(_atmos_asset, 0)));
+		reel->add (make_shared<dcp::ReelAtmosAsset>(_atmos_asset, 0));
 	}
 
 	return reel;
 }
 
+
+/** @param set_progress Method to call with progress; first parameter is the number of bytes
+ *  done, second parameter is the number of bytes in total.
+ */
 void
-ReelWriter::calculate_digests (boost::function<void (float)> set_progress)
+ReelWriter::calculate_digests(std::function<void (int64_t, int64_t)> set_progress)
+try
 {
+	vector<shared_ptr<const dcp::Asset>> assets;
+
 	if (_picture_asset) {
-		_picture_asset->hash (set_progress);
+		assets.push_back(_picture_asset);
 	}
-
 	if (_sound_asset) {
-		_sound_asset->hash (set_progress);
+		assets.push_back(_sound_asset);
 	}
-
 	if (_atmos_asset) {
-		_atmos_asset->hash (set_progress);
+		assets.push_back(_atmos_asset);
+	}
+
+	int64_t total_size = 0;
+	for (auto asset: assets) {
+		total_size += asset->file() ? boost::filesystem::file_size(*asset->file()) : 0;
 	}
+
+	int64_t total_done = 0;
+	for (auto asset: assets) {
+		asset->hash([&total_done, total_size, set_progress](int64_t done, int64_t) {
+			set_progress(total_done + done, total_size);
+		});
+		total_done += asset->file() ? boost::filesystem::file_size(*asset->file()) : 0;
+	}
+
+} catch (boost::thread_interrupted) {
+	/* set_progress contains an interruption_point, so any of these methods
+	 * may throw thread_interrupted, at which point we just give up.
+	 */
 }
 
+
 Frame
 ReelWriter::start () const
 {
@@ -725,34 +828,35 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio)
 	}
 
 	DCPOMATIC_ASSERT (audio);
-	_sound_asset_writer->write (audio->data(), audio->frames());
+	_sound_asset_writer->write(audio->data(), audio->channels(), audio->frames());
 }
 
 
 shared_ptr<dcp::SubtitleAsset>
-ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track) const
+ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool with_dummy) const
 {
 	shared_ptr<dcp::SubtitleAsset> asset;
+	optional<string> font;
 
-	vector<dcp::LanguageTag> lang = film()->subtitle_languages();
+	auto lang = film()->subtitle_languages();
 	if (film()->interop()) {
-		shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset ());
+		auto s = make_shared<dcp::InteropSubtitleAsset>();
 		s->set_movie_title (film()->name());
-		if (type == TEXT_OPEN_SUBTITLE) {
-			s->set_language (lang.empty() ? "Unknown" : lang.front().to_string());
-		} else if (!track->language.empty()) {
-			s->set_language (track->language);
+		if (type == TextType::OPEN_SUBTITLE) {
+			s->set_language (lang.first ? lang.first->to_string() : "Unknown");
+		} else if (track->language) {
+			s->set_language (track->language->to_string());
 		}
 		s->set_reel_number (raw_convert<string> (_reel_index + 1));
 		asset = s;
 	} else {
-		shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset ());
+		auto s = make_shared<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.front());
-		} else if (track && !track->language.empty()) {
-			s->set_language (dcp::LanguageTag(track->language));
+		if (type == TextType::OPEN_SUBTITLE && lang.first) {
+			s->set_language (*lang.first);
+		} else if (track && track->language) {
+			s->set_language (dcp::LanguageTag(track->language->to_string()));
 		}
 		s->set_edit_rate (dcp::Fraction (film()->video_frame_rate(), 1));
 		s->set_reel_number (_reel_index + 1);
@@ -764,20 +868,83 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track) const
 		asset = s;
 	}
 
+	if (with_dummy) {
+		asset->add(
+			std::make_shared<dcp::SubtitleString>(
+				font,
+				false,
+				false,
+				false,
+				dcp::Colour(),
+				42,
+				1.0,
+				dcp::Time(0, 0, 0, 0, 24),
+				dcp::Time(0, 0, 1, 0, 24),
+				0.5,
+				dcp::HAlign::CENTER,
+				0.5,
+				dcp::VAlign::CENTER,
+				0,
+				dcp::Direction::LTR,
+				" ",
+				dcp::Effect::NONE,
+				dcp::Colour(),
+				dcp::Time(),
+				dcp::Time(),
+				0,
+				std::vector<dcp::Ruby>()
+				)
+		       );
+
+		if (!film()->interop()) {
+			/* We must have a LoadFont since we have a Text */
+			font = "font";
+			asset->ensure_font(*font, _default_font);
+		}
+	}
+
 	return asset;
 }
 
 
+float
+ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const
+{
+	if (dcp::uses_baseline(subtitle.valign_standard) == dcp::uses_baseline(to)) {
+		/* The from and to standards use the same alignment reference */
+		return subtitle.v_position();
+	}
+
+	auto const baseline_to_bottom = _font_metrics.baseline_to_bottom(subtitle);
+	auto const height = _font_metrics.height(subtitle);
+
+	float correction = 0;
+	switch (subtitle.v_align()) {
+	case dcp::VAlign::TOP:
+		correction = height - baseline_to_bottom;
+		break;
+	case dcp::VAlign::CENTER:
+		correction = (height / 2) - baseline_to_bottom;
+		break;
+	case dcp::VAlign::BOTTOM:
+		correction = baseline_to_bottom;
+		break;
+	}
+
+	return subtitle.v_position() + (dcp::uses_bounding_box(subtitle.valign_standard) ? correction : -correction);
+}
+
+
 void
-ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
+ReelWriter::write(PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period, FontIdMap const& fonts, shared_ptr<dcpomatic::Font> chosen_interop_font)
 {
 	shared_ptr<dcp::SubtitleAsset> asset;
 
 	switch (type) {
-	case TEXT_OPEN_SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		asset = _subtitle_asset;
 		break;
-	case TEXT_CLOSED_CAPTION:
+	case TextType::CLOSED_CAPTION:
 		DCPOMATIC_ASSERT (track);
 		asset = _closed_caption_assets[*track];
 		break;
@@ -786,14 +953,14 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 	}
 
 	if (!asset) {
-		asset = empty_text_asset (type, track);
+		asset = empty_text_asset (type, track, false);
 	}
 
 	switch (type) {
-	case TEXT_OPEN_SUBTITLE:
+	case TextType::OPEN_SUBTITLE:
 		_subtitle_asset = asset;
 		break;
-	case TEXT_CLOSED_CAPTION:
+	case TextType::CLOSED_CAPTION:
 		DCPOMATIC_ASSERT (track);
 		_closed_caption_assets[*track] = asset;
 		break;
@@ -801,44 +968,58 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
 		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));
-		asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+	/* timecode rate for subtitles we emit; we might as well stick to ms accuracy here, I think */
+	auto const tcr = 1000;
+
+	for (auto i: subs.string) {
+		i.set_in  (dcp::Time(period.from.seconds() - _period.from.seconds(), tcr));
+		i.set_out (dcp::Time(period.to.seconds() - _period.from.seconds(), tcr));
+		i.set_v_position(convert_vertical_position(i, film()->interop() ? dcp::SubtitleStandard::INTEROP : dcp::SubtitleStandard::SMPTE_2014));
+		auto sub = make_shared<dcp::SubtitleString>(i);
+		/* i.font is a shared_ptr<Font> which uniquely identifies the font we want,
+		 * though if we are Interop we can only have one font, so we'll use the chosen
+		 * one instead.
+		 */
+		auto font = film()->interop() ? chosen_interop_font : i.font;
+		/* We can get the corresponding ID from fonts */
+		auto const font_id_to_use = fonts.get(font);
+		/* Give this subtitle the correct font ID */
+		sub->set_font(font_id_to_use);
+		asset->add(sub);
+		/* Make sure the asset LoadFonts the font we just asked for */
+		asset->ensure_font(font_id_to_use, font->data().get_value_or(_default_font));
 	}
 
-	BOOST_FOREACH (BitmapText i, subs.bitmap) {
+	for (auto 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()
-					)
+			make_shared<dcp::SubtitleImage>(
+				image_as_png(i.image),
+				dcp::Time(period.from.seconds() - _period.from.seconds(), tcr),
+				dcp::Time(period.to.seconds() - _period.from.seconds(), tcr),
+				i.rectangle.x, dcp::HAlign::LEFT, i.rectangle.y, dcp::VAlign::TOP, 0,
+				dcp::Time(), dcp::Time()
 				)
 			);
 	}
 }
 
+
 bool
-ReelWriter::existing_picture_frame_ok (FILE* asset_file, shared_ptr<InfoFileHandle> info_file, Frame frame) const
+ReelWriter::existing_picture_frame_ok (dcp::File& asset_file, shared_ptr<InfoFileHandle> info_file, Frame frame) const
 {
 	LOG_GENERAL ("Checking existing picture frame %1", frame);
 
 	/* Read the data from the info file; for 3D we just check the left
 	   frames until we find a good one.
 	*/
-	dcp::FrameInfo const info = read_frame_info (info_file, frame, film()->three_d() ? EYES_LEFT : EYES_BOTH);
+	auto const info = read_frame_info (info_file, frame, film()->three_d() ? Eyes::LEFT : Eyes::BOTH);
 
 	bool ok = true;
 
 	/* Read the data from the asset and hash it */
-	dcpomatic_fseek (asset_file, info.offset, SEEK_SET);
+	asset_file.seek(info.offset, SEEK_SET);
 	ArrayData data (info.size);
-	size_t const read = fread (data.data(), 1, data.size(), asset_file);
+	size_t const read = asset_file.read(data.data(), 1, data.size());
 	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);