X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=2dd46f0b2324f4516364b319ab2a1561542cba26;hp=3aca2ab89c96328445907dbbd88ae64156b722ac;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=8a8c977c12fc65f1f50ea05099387e0fc8840e7d

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 3aca2ab89..2dd46f0b2 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,31 +19,30 @@
 */
 
 
-#include "writer.h"
-#include "compose.hpp"
-#include "film.h"
-#include "ratio.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "dcp_video.h"
-#include "dcp_content_type.h"
+#include "audio_buffers.h"
 #include "audio_mapping.h"
+#include "compose.hpp"
 #include "config.h"
-#include "job.h"
 #include "cross.h"
-#include "audio_buffers.h"
-#include "version.h"
-#include "font_data.h"
-#include "util.h"
+#include "dcp_content_type.h"
+#include "dcp_video.h"
+#include "dcpomatic_log.h"
+#include "film.h"
+#include "job.h"
+#include "log.h"
+#include "ratio.h"
 #include "reel_writer.h"
 #include "text_content.h"
+#include "util.h"
+#include "version.h"
+#include "writer.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
+#include <dcp/raw_convert.h>
 #include <dcp/reel_file_asset.h>
-#include <fstream>
 #include <cerrno>
-#include <iostream>
 #include <cfloat>
+#include <set>
 
 #include "i18n.h"
 
@@ -58,6 +57,7 @@ using std::make_shared;
 using std::max;
 using std::min;
 using std::shared_ptr;
+using std::set;
 using std::string;
 using std::vector;
 using std::weak_ptr;
@@ -303,12 +303,12 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 			DCPOMATIC_ASSERT ((part_frames[0] + part_frames[1]) <= audio->frames());
 
 			if (part_frames[0]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers(audio, part_frames[0], 0));
+				auto part = make_shared<AudioBuffers>(audio, part_frames[0], 0);
 				_audio_reel->write (part);
 			}
 
 			if (part_frames[1]) {
-				audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0]));
+				audio = make_shared<AudioBuffers>(audio, part_frames[1], part_frames[0]);
 			} else {
 				audio.reset ();
 			}
@@ -605,7 +605,7 @@ Writer::finish (boost::filesystem::path output_dcp)
 	/* Add reels */
 
 	for (auto& i: _reels) {
-		cpl->add (i.create_reel(_reel_assets, _fonts, output_dcp, _have_subtitles, _have_closed_captions));
+		cpl->add (i.create_reel(_reel_assets, _fonts, _chosen_interop_font, output_dcp, _have_subtitles, _have_closed_captions));
 	}
 
 	/* Add metadata */
@@ -801,7 +801,7 @@ Writer::can_fake_write (Frame frame) const
 
 	/* Make frame relative to the start of the reel */
 	frame -= reel.start ();
-	return (frame != 0 && frame < reel.first_nonexistant_frame());
+	return (frame != 0 && frame < reel.first_nonexistent_frame());
 }
 
 
@@ -855,26 +855,79 @@ Writer::write (PlayerText text, TextType type, optional<DCPTextTrack> track, DCP
 		period = back_off(period);
 	}
 
-	(*reel)->write (text, type, track, period);
+	(*reel)->write(text, type, track, period, _fonts);
 }
 
 
 void
-Writer::write (vector<FontData> fonts)
+Writer::write (vector<shared_ptr<Font>> fonts)
 {
-	/* Just keep a list of unique fonts and we'll deal with them in ::finish */
+	if (fonts.empty()) {
+		return;
+	}
 
-	for (auto const& i: fonts) {
-		bool got = false;
-		for (auto& j: _fonts) {
-			if (i == j) {
-				got = true;
-			}
+	/* Fonts may come in with empty IDs but we don't want to put those in the DCP */
+	auto fix_id = [](string id) {
+		return id.empty() ? "font" : id;
+	};
+
+	if (film()->interop()) {
+		/* Interop will ignore second and subsequent <LoadFont>s so we don't want to
+		 * even write them as they upset some validators.  Set up _fonts so that every
+		 * font used by any subtitle will be written with the same ID.
+		 */
+		for (size_t i = 0; i < fonts.size(); ++i) {
+			_fonts.put(fonts[i], fix_id(fonts[0]->id()));
 		}
+		_chosen_interop_font = fonts[0];
+	} else {
+		set<string> used_ids;
+
+		/* Return the index of a _N at the end of a string, or string::npos */
+		auto underscore_number_position = [](string s) {
+			auto last_underscore = s.find_last_of("_");
+			if (last_underscore == string::npos) {
+				return string::npos;
+			}
+
+			for (auto i = last_underscore + 1; i < s.size(); ++i) {
+				if (!isdigit(s[i])) {
+					return string::npos;
+				}
+			}
+
+			return last_underscore;
+		};
 
-		if (!got) {
-			_fonts.push_back (i);
+		/* Write fonts to _fonts, changing any duplicate IDs so that they are unique */
+		for (auto font: fonts) {
+			auto id = fix_id(font->id());
+			if (used_ids.find(id) == used_ids.end()) {
+				/* This ID is unique so we can just use it as-is */
+				_fonts.put(font, id);
+				used_ids.insert(id);
+			} else {
+				auto end = underscore_number_position(id);
+				if (end == string::npos) {
+					/* This string has no _N suffix, so add one */
+					id += "_0";
+					end = underscore_number_position(id);
+				}
+
+				++end;
+
+				/* Increment the suffix until we find a unique one */
+				auto number = dcp::raw_convert<int>(id.substr(end));
+				while (used_ids.find(id) != used_ids.end()) {
+					++number;
+					id = String::compose("%1_%2", id.substr(0, end - 1), number);
+				}
+				used_ids.insert(id);
+			}
+			_fonts.put(font, id);
 		}
+
+		DCPOMATIC_ASSERT(_fonts.map().size() == used_ids.size());
 	}
 }
 
@@ -976,7 +1029,7 @@ Writer::write_hanging_text (ReelWriter& reel)
 	vector<HangingText> new_hanging_texts;
 	for (auto i: _hanging_texts) {
 		if (i.period.from == reel.period().from) {
-			reel.write (i.text, i.type, i.track, i.period);
+			reel.write (i.text, i.type, i.track, i.period, _fonts);
 		} else {
 			new_hanging_texts.push_back (i);
 		}