X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=c57d694d0718c2c477f5f3126b564a441dd70344;hp=92a415ae121fc309f2cc7ae0bd2e80ccee342915;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0 diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 92a415ae1..c57d694d0 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. @@ -25,15 +25,16 @@ #include #include "lib/film.h" -#include "lib/dcp_subtitle_content.h" +#include "lib/dcp_text_content.h" #include "lib/dcp_content.h" #include "lib/ratio.h" #include "lib/dcp_decoder.h" #include "lib/dcp_content_type.h" -#include "lib/dcp_subtitle_decoder.h" -#include "lib/subtitle_content.h" +#include "lib/dcp_text_decoder.h" +#include "lib/text_content.h" #include "lib/content_subtitle.h" -#include "lib/subtitle_decoder.h" +#include "lib/font.h" +#include "lib/text_decoder.h" #include "test.h" #include @@ -47,7 +48,13 @@ optional stored; static void store (ContentTextSubtitle sub) { - stored = 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 */ @@ -57,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 DCPTextContent (film, "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()); content->subtitle->set_use (true); content->subtitle->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 ())); } @@ -80,10 +88,10 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) 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")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr decoder (new DCPDecoder (content, film->log())); - decoder->subtitle->TextData.connect (bind (store, _1)); + shared_ptr decoder (new DCPDecoder (content, film->log(), false)); + decoder->subtitle->TextStart.connect (bind (store, _1)); stored = optional (); while (!decoder->pass() && !stored) {} @@ -101,16 +109,16 @@ 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 DCPTextContent (film, "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, film->log())); - decoder->subtitle->TextData.connect (bind (store, _1)); + shared_ptr decoder (new DCPTextDecoder (content, film->log())); + decoder->subtitle->TextStart.connect (bind (store, _1)); stored = optional (); while (!decoder->pass ()) { - if (stored && stored->period().from == ContentTime(0)) { + if (stored && stored->from() == ContentTime(0)) { BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); } } @@ -124,18 +132,18 @@ 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 DCPTextContent (film, "test/data/dcp_sub3.xml")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr decoder (new DCPSubtitleDecoder (content, film->log())); + shared_ptr decoder (new DCPTextDecoder (content, film->log())); stored = optional (); while (!decoder->pass ()) { - decoder->subtitle->TextData.connect (bind (store, _1)); - if (stored && stored->period().from == ContentTime::from_seconds(0.08)) { + decoder->subtitle->TextStart.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"); @@ -150,3 +158,26 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) } } } + +/** 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 (film, "test/data/dcp_sub3.xml")); + film->examine_and_add_content (content); + shared_ptr content2 (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + film->examine_and_add_content (content2); + BOOST_REQUIRE (!wait_for_jobs ()); + + content->subtitle->add_font (shared_ptr (new Font ("font1"))); + content2->subtitle->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); +}