# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.6.13'))
- deps.append(('libsub', 'v1.4.15'))
+ deps.append(('libdcp', 'v1.6.14'))
+ deps.append(('libsub', 'v1.4.16'))
deps.append(('rtaudio-cdist', 'bf0fc23'))
return deps
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+ sc->fix_empty_font_ids ();
+
BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
}
: Decoder (film)
{
shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+ c->fix_empty_font_ids ();
_subtitles = c->subtitles ();
_next = _subtitles.begin ();
/*
- Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
doc.read_file (subtitle_file (film));
BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
}
+
+static
+void
+check_font_tags (list<cxml::NodePtr> nodes)
+{
+ BOOST_FOREACH (cxml::NodePtr i, nodes) {
+ if (i->name() == "Font") {
+ BOOST_CHECK (!i->optional_string_attribute("Id") || i->string_attribute("Id") != "");
+ }
+ check_font_tags (i->node_children());
+ }
+}
+
+/** Check that imported <LoadFont> tags with empty IDs (or corresponding Font tags with empty IDs)
+ * are not passed through into the DCP.
+ */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
+{
+ shared_ptr<Film> film = new_test_film2 ("dcp_subtitle_test5");
+ film->set_interop (true);
+
+ shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent("test/data/dcp_sub6.xml"));
+ film->examine_and_add_content (content);
+ BOOST_REQUIRE (!wait_for_jobs());
+
+ film->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs());
+ film->write_metadata ();
+
+ cxml::Document doc ("DCSubtitle");
+ doc.read_file (subtitle_file(film));
+ BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+ BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != "");
+
+ check_font_tags (doc.node_children());
+}
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.13', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.14', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.13', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.14', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub