X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Freel_writer.cc;h=521ba55df891f226393fdb7a6d12e5b139ebe6de;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hp=3eb43161e45c413727be579636af0afa81d97a84;hpb=5f9608c9d15a269d890af222fc3d28a253d2b1e9;p=dcpomatic.git

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 3eb43161e..521ba55df 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -32,24 +32,26 @@
 #include "image.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/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 "i18n.h"
@@ -166,12 +168,12 @@ ReelWriter::ReelWriter (
 	}
 
 	if (film()->audio_channels()) {
-		auto langs = film()->audio_languages();
+		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(),
-			langs.empty() ? dcp::LanguageTag("en-US") : langs.front(),
+			lang ? *lang : dcp::LanguageTag("en-US"),
 			standard
 			);
 
@@ -438,8 +440,8 @@ ReelWriter::finish (boost::filesystem::path output_dcp)
 	}
 }
 
-template <class T>
-shared_ptr<T>
+template <class Interop, class SMPTE, class Result>
+shared_ptr<Result>
 maybe_add_text (
 	shared_ptr<dcp::SubtitleAsset> asset,
 	int64_t picture_duration,
@@ -455,7 +457,7 @@ 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 */
@@ -463,33 +465,38 @@ maybe_add_text (
 			asset->add_font (j.id, j.data.get_value_or(default_font));
 		}
 
-		if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) {
-			auto directory = output_dcp / asset->id ();
+		if (auto interop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(asset)) {
+			auto directory = output_dcp / interop->id ();
 			boost::filesystem::create_directories (directory);
-			asset->write (directory / ("sub_" + asset->id() + ".xml"));
-		} else {
+			interop->write (directory / ("sub_" + interop->id() + ".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 (
+			smpte->set_intrinsic_duration(picture_duration);
+			smpte->write (
 				output_dcp / ("sub_" + asset->id() + ".mxf")
 				);
+			reel_asset = make_shared<SMPTE> (
+				smpte,
+				dcp::Fraction(film->video_frame_rate(), 1),
+				picture_duration,
+				0
+				);
 		}
 
-		reel_asset = make_shared<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 */
 		for (auto j: refs) {
-			auto k = dynamic_pointer_cast<T> (j.asset);
+			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 */
@@ -622,7 +629,7 @@ ReelWriter::create_reel_text (
 	set<DCPTextTrack> ensure_closed_captions
 	) const
 {
-	auto subtitle = maybe_add_text<dcp::ReelSubtitleAsset> (
+	auto subtitle = maybe_add_text<dcp::ReelInteropSubtitleAsset, dcp::ReelSMPTESubtitleAsset, dcp::ReelSubtitleAsset> (
 		_subtitle_asset, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only
 		);
 
@@ -633,7 +640,7 @@ ReelWriter::create_reel_text (
 		}
 	} else if (ensure_subtitles) {
 		/* We had no subtitle asset, but we've been asked to make sure there is one */
-		subtitle = maybe_add_text<dcp::ReelSubtitleAsset>(
+		subtitle = maybe_add_text<dcp::ReelInteropSubtitleAsset, dcp::ReelSMPTESubtitleAsset, dcp::ReelSubtitleAsset> (
 			empty_text_asset(TextType::OPEN_SUBTITLE, optional<DCPTextTrack>()),
 			duration,
 			reel,
@@ -648,13 +655,13 @@ ReelWriter::create_reel_text (
 	}
 
 	for (auto const& i: _closed_caption_assets) {
-		auto a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+		auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> (
 			i.second, duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only
 			);
 		DCPOMATIC_ASSERT (a);
 		a->set_annotation_text (i.first.name);
-		if (!i.first.language.empty()) {
-			a->set_language (dcp::LanguageTag(i.first.language));
+		if (i.first.language) {
+			a->set_language (i.first.language.get());
 		}
 
 		ensure_closed_captions.erase (i.first);
@@ -662,13 +669,13 @@ ReelWriter::create_reel_text (
 
 	/* 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::ReelClosedCaptionAsset> (
+		auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> (
 			empty_text_asset(TextType::CLOSED_CAPTION, i), duration, reel, refs, fonts, _default_font, film(), _period, output_dcp, _text_only
 			);
 		DCPOMATIC_ASSERT (a);
 		a->set_annotation_text (i.name);
-		if (!i.language.empty()) {
-			a->set_language (dcp::LanguageTag(i.language));
+		if (i.language) {
+			a->set_language (i.language.get());
 		}
 	}
 }
@@ -737,7 +744,8 @@ ReelWriter::create_reel (
 }
 
 void
-ReelWriter::calculate_digests (boost::function<void (float)> set_progress)
+ReelWriter::calculate_digests (std::function<void (float)> set_progress)
+try
 {
 	if (_picture_asset) {
 		_picture_asset->hash (set_progress);
@@ -750,6 +758,10 @@ ReelWriter::calculate_digests (boost::function<void (float)> set_progress)
 	if (_atmos_asset) {
 		_atmos_asset->hash (set_progress);
 	}
+} 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
@@ -782,8 +794,8 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track) const
 		s->set_movie_title (film()->name());
 		if (type == TextType::OPEN_SUBTITLE) {
 			s->set_language (lang.first ? lang.first->to_string() : "Unknown");
-		} else if (!track->language.empty()) {
-			s->set_language (track->language);
+		} else if (track->language) {
+			s->set_language (track->language->to_string());
 		}
 		s->set_reel_number (raw_convert<string> (_reel_index + 1));
 		asset = s;
@@ -793,8 +805,8 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track) const
 		s->set_metadata (mxf_metadata());
 		if (type == TextType::OPEN_SUBTITLE && lang.first) {
 			s->set_language (*lang.first);
-		} else if (track && !track->language.empty()) {
-			s->set_language (dcp::LanguageTag(track->language));
+		} 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);