From 54b2c8580ee0553fbfb88e8881af60e3afa2e2fd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 26 Aug 2023 19:49:25 +0200 Subject: [PATCH] Restore burnt subtitle tests. --- test/burnt_subtitle_test.cc | 58 ++++++++++++++++++++------------ test/data | 2 +- test/required_disk_space_test.cc | 6 ++-- test/wscript | 3 +- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index 8136253e2..104cbe95c 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -29,10 +29,8 @@ #include "lib/content_factory.h" #include "lib/dcp_content.h" #include "lib/dcp_content_type.h" -#include "lib/dcp_text_content.h" #include "lib/film.h" #include "lib/log_entry.h" -#include "lib/plain_text_content.h" #include "lib/ratio.h" #include "lib/text_content.h" #include "test.h" @@ -52,6 +50,7 @@ using std::dynamic_pointer_cast; using std::make_shared; using std::map; +using std::string; using namespace dcpomatic; @@ -62,14 +61,21 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - auto content = make_shared(film, "test/data/subrip2.srt"); - content->subtitle->set_use (true); - content->subtitle->set_burn (true); + auto content = content_factory("test/data/subrip2.srt")[0]; + content->text[0]->set_use(true); + content->text[0]->set_burn(true); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - make_and_verify_dcp (film); + make_and_verify_dcp( + film, + { dcp::VerificationNote::Code::MISSING_CPL_METADATA } + ); - check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ())); +#ifdef DCPOMATIC_WINDOWS + check_dcp("test/data/windows/burnt_subtitle_test_subrip", film); +#else + check_dcp("test/data/burnt_subtitle_test_subrip", film); +#endif } /** Build a small DCP with no picture and a single subtitle overlaid onto it from a DCP XML file */ @@ -79,13 +85,19 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - auto content = make_shared(film, "test/data/dcp_sub.xml"); - content->subtitle->set_use (true); + auto content = content_factory("test/data/dcp_sub.xml")[0]; + content->text[0]->set_use(true); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); - make_and_verify_dcp (film); - - check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ())); + make_and_verify_dcp( + film, + { + dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE, + dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME, + dcp::VerificationNote::Code::MISSING_CPL_METADATA + }); + + check_dcp("test/data/burnt_subtitle_test_dcp", film); } /** Burn some subtitles into an existing DCP to check the colour conversion */ @@ -95,7 +107,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - film->examine_and_add_content (content_factory(film, "test/data/flat_black.png")[0]); + film->examine_and_add_content(content_factory("test/data/flat_black.png")[0]); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp (film); @@ -104,13 +116,11 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) film2->set_container (Ratio::from_id ("185")); film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film2->set_name ("frobozz"); - auto background_dcp = make_shared(film2, film->dir(film->dcp_name())); + auto background_dcp = make_shared(film->dir(film->dcp_name())); film2->examine_and_add_content (background_dcp); - auto sub = dynamic_pointer_cast ( - content_factory(film2, "test/data/subrip2.srt")[0] - ); - sub->subtitle->set_burn (true); - sub->subtitle->set_outline (true); + auto sub = content_factory("test/data/subrip2.srt")[0]; + sub->text[0]->set_burn(true); + sub->text[0]->set_effect(dcp::Effect::BORDER); film2->examine_and_add_content (sub); BOOST_REQUIRE (!wait_for_jobs()); make_and_verify_dcp (film2); @@ -120,8 +130,8 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) dcp::DCP dcp (film2->dir (film2->dcp_name ())); dcp.read (); - BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1); - BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1); + BOOST_REQUIRE_EQUAL(dcp.cpls().size(), 1U); + BOOST_REQUIRE_EQUAL(dcp.cpls().front()->reels().size(), 1U); BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()); BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()->asset()); auto pic = dynamic_pointer_cast ( @@ -133,5 +143,9 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp) BOOST_CHECK_EQUAL (xyz->size().width, 1998); BOOST_CHECK_EQUAL (xyz->size().height, 1080); - check_dcp ("test/data/burnt_subtitle_test_onto_dcp", film->dir(film->dcp_name())); +#ifdef DCPOMATIC_WINDOWS + check_dcp("test/data/windows/burnt_subtitle_test_onto_dcp2", film2); +#else + check_dcp("test/data/burnt_subtitle_test_onto_dcp2", film2); +#endif } diff --git a/test/data b/test/data index fd0d1c8ef..068d94418 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit fd0d1c8ef46a4b3ad45ed773fa58069a7fb1737a +Subproject commit 068d944183876d7a323ef60f80bdd4deee8218e1 diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc index db659c2c9..fad24389b 100644 --- a/test/required_disk_space_test.cc +++ b/test/required_disk_space_test.cc @@ -58,8 +58,8 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test) check_within_n ( film->required_disk_space(), - 289LL * (100000000 / 8) / 24 + // video - 289LL * 48000 * 6 * 3 / 24 + // audio + 288LL * (100000000 / 8) / 24 + // video + 288LL * 48000 * 6 * 3 / 24 + // audio 65536, // extra 16 ); @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test) check_within_n ( film->required_disk_space(), 240LL * (100000000 / 8) / 24 + // video - 289LL * 48000 * 6 * 3 / 24 + // audio + 288LL * 48000 * 6 * 3 / 24 + // audio 65536, // extra 16 ); diff --git a/test/wscript b/test/wscript index 12cc0506f..f40568e3c 100644 --- a/test/wscript +++ b/test/wscript @@ -57,6 +57,7 @@ def build(bld): audio_processor_test.cc audio_processor_delay_test.cc audio_ring_buffers_test.cc + burnt_subtitle_test.cc butler_test.cc bv20_test.cc cinema_sound_processor_test.cc @@ -178,8 +179,6 @@ def build(bld): obj.source += " disk_writer_test.cc" obj.uselib += "LWEXT4 NANOMSG " - # Some difference in font rendering between the test machine and others... - # burnt_subtitle_test.cc # This one doesn't check anything # resampler_test.cc -- 2.30.2