X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=5a1cf4391123eacee35b2db6e0e3b3cbeeb155c4;hp=34059a680bba3f0a0892592828333751f2f9afd7;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=2dd34ab7469a8a01de368b7a204ad0e8f2d5aefd diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 34059a680..5a1cf4391 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -20,6 +20,7 @@ /** @file test/dcp_subtitle_test.cc * @brief Test DCP subtitle content in various ways. + * @ingroup specific */ #include @@ -30,15 +31,31 @@ #include "lib/dcp_decoder.h" #include "lib/dcp_content_type.h" #include "lib/dcp_subtitle_decoder.h" -#include "lib/subtitle_content.h" -#include "lib/content_subtitle.h" -#include "lib/subtitle_decoder.h" +#include "lib/text_content.h" +#include "lib/content_text.h" +#include "lib/font.h" +#include "lib/text_decoder.h" #include "test.h" #include using std::cout; using std::list; using boost::shared_ptr; +using boost::optional; + +optional stored; + +static void +store (ContentStringText sub) +{ + if (!stored) { + stored = sub; + } else { + BOOST_FOREACH (dcp::SubtitleString i, sub.subs) { + stored->subs.push_back (i); + } + } +} /** Test pass-through of a very simple DCP subtitle file */ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) @@ -47,16 +64,17 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_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 DCPSubtitleContent (film, "test/data/dcp_sub.xml")); + film->set_interop (false); + shared_ptr content (new DCPSubtitleContent ("test/data/dcp_sub.xml")); film->examine_and_add_content (content); - wait_for_jobs (); + 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->subtitle->set_use (true); - content->subtitle->set_burn (false); + content->only_text()->set_use (true); + content->only_text()->set_burn (false); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); check_dcp ("test/data/dcp_subtitle_test", film->dir (film->dcp_name ())); } @@ -68,39 +86,20 @@ 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); - wait_for_jobs (); - - shared_ptr decoder (new DCPDecoder (content, film->log())); - - list ctp = decoder->text_subtitles_during ( - ContentTimePeriod ( - ContentTime::from_seconds (25), - ContentTime::from_seconds (26) - ), - true - ); - - BOOST_REQUIRE_EQUAL (ctp.size(), 2); - BOOST_CHECK_EQUAL (ctp.front().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get()); - BOOST_CHECK_EQUAL (ctp.front().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get()); - BOOST_CHECK_EQUAL (ctp.back().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get()); - BOOST_CHECK_EQUAL (ctp.back().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get()); - - list subs = decoder->subtitle->get_text ( - ContentTimePeriod ( - ContentTime::from_seconds (25), - ContentTime::from_seconds (26) - ), - true, - true - ); - - BOOST_REQUIRE_EQUAL (subs.size(), 1); - BOOST_REQUIRE_EQUAL (subs.front().subs.size(), 2); - BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal."); - BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois."); + BOOST_REQUIRE (!wait_for_jobs ()); + + shared_ptr decoder (new DCPDecoder (content, false)); + decoder->only_text()->PlainStart.connect (bind (store, _1)); + + stored = optional (); + while (!decoder->pass(film) && !stored) {} + + BOOST_REQUIRE (stored); + BOOST_REQUIRE_EQUAL (stored->subs.size(), 2); + BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal."); + BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois."); } /** Test subtitles whose text includes things like <b> */ @@ -110,15 +109,75 @@ 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); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); + + shared_ptr decoder (new DCPSubtitleDecoder(content)); + decoder->only_text()->PlainStart.connect (bind (store, _1)); + + stored = optional (); + while (!decoder->pass(film)) { + if (stored && stored->from() == ContentTime(0)) { + BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); + } + } +} + +/** Test a failure case */ +BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) +{ + shared_ptr film = new_test_film ("dcp_subtitle_test3"); + film->set_container (Ratio::from_id ("185")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); + film->set_name ("frobozz"); + film->set_interop (true); + 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)); - list sub = decoder->subtitle->get_text ( - ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true - ); - BOOST_REQUIRE_EQUAL (sub.size(), 1); - BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 1); - BOOST_CHECK_EQUAL (sub.front().subs.front().text(), "<b>Hello world!</b>"); + stored = optional (); + while (!decoder->pass (film)) { + 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 (); + BOOST_CHECK_EQUAL (i->text(), "This"); + ++i; + BOOST_REQUIRE (i != s.end ()); + BOOST_CHECK_EQUAL (i->text(), " is "); + ++i; + BOOST_REQUIRE (i != s.end ()); + BOOST_CHECK_EQUAL (i->text(), "wrong."); + ++i; + BOOST_REQUIRE (i == s.end ()); + } + } +} + +/** Check that Interop DCPs aren't made with more than one (#1273) */ +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 ("test/data/dcp_sub3.xml")); + film->examine_and_add_content (content); + shared_ptr content2 (new DCPSubtitleContent ("test/data/dcp_sub3.xml")); + film->examine_and_add_content (content2); + BOOST_REQUIRE (!wait_for_jobs ()); + + 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 ()); + + cxml::Document doc ("DCSubtitle"); + doc.read_file (subtitle_file (film)); + BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1); }