X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=17569d68ed1dfeaa1cbddee5e62a2c46e6c1c49d;hp=48f88f8dcbbe534ba1bb6b599a42607003421925;hb=07f451e01f82793904482f55c5a89163c6bb8e44;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1 diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 48f88f8dc..17569d68e 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -31,10 +31,10 @@ #include "lib/dcp_decoder.h" #include "lib/dcp_content_type.h" #include "lib/dcp_subtitle_decoder.h" -#include "lib/caption_content.h" -#include "lib/content_caption.h" +#include "lib/text_content.h" +#include "lib/content_text.h" #include "lib/font.h" -#include "lib/caption_decoder.h" +#include "lib/text_decoder.h" #include "test.h" #include @@ -43,10 +43,10 @@ using std::list; using boost::shared_ptr; using boost::optional; -optional stored; +optional stored; static void -store (ContentTextCaption sub) +store (ContentStringText sub) { if (!stored) { stored = sub; @@ -65,14 +65,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (false); - shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub.xml")); + shared_ptr content (new DCPSubtitleContent ("test/data/dcp_sub.xml")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get()); + BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(2).get()); - content->caption->set_use (true); - content->caption->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); @@ -86,14 +86,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new DCPContent (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); + shared_ptr content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr decoder (new DCPDecoder (content, film->log(), false)); - decoder->caption->PlainStart.connect (bind (store, _1)); + shared_ptr decoder (new DCPDecoder (film, content, false)); + decoder->only_text()->PlainStart.connect (bind (store, _1)); - stored = optional (); + stored = optional (); while (!decoder->pass() && !stored) {} BOOST_REQUIRE (stored); @@ -109,15 +109,15 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml")); + shared_ptr content (new DCPSubtitleContent("test/data/dcp_sub2.xml")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr decoder (new DCPSubtitleDecoder (content, film->log())); - decoder->caption->PlainStart.connect (bind (store, _1)); + shared_ptr decoder (new DCPSubtitleDecoder(film, content)); + decoder->only_text()->PlainStart.connect (bind (store, _1)); - stored = optional (); - while (!decoder->pass ()) { + stored = optional (); + while (!decoder->pass()) { if (stored && stored->from() == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); } @@ -132,17 +132,17 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); film->set_interop (true); - shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + shared_ptr content (new DCPSubtitleContent ("test/data/dcp_sub3.xml")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr decoder (new DCPSubtitleDecoder (content, film->log())); - stored = optional (); + shared_ptr decoder (new DCPSubtitleDecoder (film, content)); + stored = optional (); while (!decoder->pass ()) { - decoder->caption->PlainStart.connect (bind (store, _1)); + decoder->only_text()->PlainStart.connect (bind (store, _1)); if (stored && stored->from() == ContentTime::from_seconds(0.08)) { list s = stored->subs; list::const_iterator i = s.begin (); @@ -165,14 +165,14 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) shared_ptr film = new_test_film2 ("dcp_subtitle_test4"); film->set_interop (true); - shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + shared_ptr content (new DCPSubtitleContent ("test/data/dcp_sub3.xml")); film->examine_and_add_content (content); - shared_ptr content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + shared_ptr content2 (new DCPSubtitleContent ("test/data/dcp_sub3.xml")); film->examine_and_add_content (content2); BOOST_REQUIRE (!wait_for_jobs ()); - content->caption->add_font (shared_ptr (new Font ("font1"))); - content2->caption->add_font (shared_ptr (new Font ("font2"))); + content->only_text()->add_font (shared_ptr (new Font ("font1"))); + content2->only_text()->add_font (shared_ptr (new Font ("font2"))); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs ()); @@ -181,3 +181,39 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) doc.read_file (subtitle_file (film)); BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1); } + +static +void +check_font_tags (list 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 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 = new_test_film2 ("dcp_subtitle_test5"); + film->set_interop (true); + + shared_ptr 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()); +}