From cb6729aa79b555b219974207fbe2ff0510f9d3ea Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Jan 2021 23:42:28 +0100 Subject: Bump libdcp for better verification, and make API adjustments. --- test/closed_caption_test.cc | 4 ++-- test/dcp_decoder_test.cc | 31 ++++++++++++++++--------------- test/digest_test.cc | 4 ++-- test/import_dcp_test.cc | 30 +++++++++++++++--------------- test/reels_test.cc | 10 +++++----- test/subtitle_reel_test.cc | 8 ++++---- test/torture_test.cc | 10 +++++----- 7 files changed, 49 insertions(+), 48 deletions(-) (limited to 'test') diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc index 4c59be72b..48fc8e05c 100644 --- a/test/closed_caption_test.cc +++ b/test/closed_caption_test.cc @@ -83,10 +83,10 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2) BOOST_REQUIRE_EQUAL (check.cpls().size(), 1U); BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1U); - list > ccaps = check.cpls().front()->reels().front()->closed_captions(); + auto ccaps = check.cpls().front()->reels().front()->closed_captions(); BOOST_REQUIRE_EQUAL (ccaps.size(), 3U); - list >::const_iterator i = ccaps.begin (); + auto i = ccaps.begin (); BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track"); BOOST_REQUIRE (static_cast((*i)->language())); BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR"); diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index 0cd972249..28538a281 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -39,6 +39,7 @@ using std::list; using std::string; using std::vector; +using std::make_shared; using std::shared_ptr; /* Check that DCPDecoder reuses old data when it should */ @@ -46,14 +47,14 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) { /* Make some DCPs */ - shared_ptr ov = new_test_film2 ("check_reuse_old_data_ov"); + auto ov = new_test_film2 ("check_reuse_old_data_ov"); ov->examine_and_add_content (content_factory("test/data/flat_red.png").front()); BOOST_REQUIRE (!wait_for_jobs()); ov->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr vf = new_test_film2 ("check_reuse_old_data_vf"); - shared_ptr ov_content(new DCPContent(ov->dir(ov->dcp_name(false)))); + auto vf = new_test_film2 ("check_reuse_old_data_vf"); + auto ov_content = make_shared(ov->dir(ov->dcp_name(false))); vf->examine_and_add_content (ov_content); vf->examine_and_add_content (content_factory("test/data/L.wav").front()); BOOST_REQUIRE (!wait_for_jobs()); @@ -61,7 +62,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) vf->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr encrypted = new_test_film2 ("check_reuse_old_data_decrypted"); + auto encrypted = new_test_film2 ("check_reuse_old_data_decrypted"); encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front()); BOOST_REQUIRE (!wait_for_jobs()); encrypted->set_encrypted (true); @@ -71,7 +72,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name())); encrypted_dcp.read (); - dcp::EncryptedKDM kdm = encrypted->make_kdm ( + auto kdm = encrypted->make_kdm ( Config::instance()->decryption_chain()->leaf(), vector(), encrypted_dcp.cpls().front()->file().get(), @@ -85,15 +86,15 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) /* Add just the OV to a new project, move it around a bit and check that the _reels get reused. */ - shared_ptr test = new_test_film2 ("check_reuse_old_data_test1"); - ov_content.reset (new DCPContent(ov->dir(ov->dcp_name(false)))); + auto test = new_test_film2 ("check_reuse_old_data_test1"); + ov_content = make_shared(ov->dir(ov->dcp_name(false))); test->examine_and_add_content (ov_content); BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr player (new Player(test)); + auto player = make_shared(test); - shared_ptr decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); + auto decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); - list > reels = decoder->reels(); + auto reels = decoder->reels(); ov_content->set_position (test, dcpomatic::DCPTime(96000)); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); @@ -104,7 +105,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) _reels did not get reused. */ test = new_test_film2 ("check_reuse_old_data_test2"); - shared_ptr vf_content (new DCPContent(vf->dir(vf->dcp_name(false)))); + auto vf_content = make_shared(vf->dir(vf->dcp_name(false))); test->examine_and_add_content (vf_content); BOOST_REQUIRE (!wait_for_jobs()); player.reset (new Player(test)); @@ -114,7 +115,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) reels = decoder->reels(); vf_content->add_ov (ov->dir(ov->dcp_name(false))); - JobManager::instance()->add (shared_ptr(new ExamineContentJob(test, vf_content))); + JobManager::instance()->add (make_shared(test, vf_content)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); @@ -122,17 +123,17 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) /* Add a KDM to an encrypted DCP and check that the _reels did not get reused */ test = new_test_film2 ("check_reuse_old_data_test3"); - shared_ptr encrypted_content (new DCPContent(encrypted->dir(encrypted->dcp_name(false)))); + auto encrypted_content = make_shared(encrypted->dir(encrypted->dcp_name(false))); test->examine_and_add_content (encrypted_content); BOOST_REQUIRE (!wait_for_jobs()); - player.reset (new Player(test)); + player = make_shared(test); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); reels = decoder->reels(); encrypted_content->add_kdm (kdm); - JobManager::instance()->add (shared_ptr(new ExamineContentJob(test, encrypted_content))); + JobManager::instance()->add (make_shared(test, encrypted_content)); BOOST_REQUIRE (!wait_for_jobs()); decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); diff --git a/test/digest_test.cc b/test/digest_test.cc index 5145ee7e3..ba73461bf 100644 --- a/test/digest_test.cc +++ b/test/digest_test.cc @@ -79,9 +79,9 @@ BOOST_AUTO_TEST_CASE (digest_test) dcp::DCP dcp (film->dir (film->dcp_name ())); dcp.read (); BOOST_CHECK_EQUAL (dcp.cpls().size(), 1U); - list > reels = dcp.cpls().front()->reels (); + auto reels = dcp.cpls()[0]->reels(); - list >::const_iterator i = reels.begin (); + auto i = reels.begin (); BOOST_REQUIRE (i != reels.end ()); BOOST_REQUIRE ((*i)->main_picture()->hash()); BOOST_REQUIRE ((*i)->main_picture()->asset()->file()); diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 05b020e1c..7ecb6c822 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -111,9 +111,9 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) content->video->set_length (24 * 60 * 10); - film->set_marker(dcp::FFOC, dcpomatic::DCPTime::from_seconds(1.91)); - film->set_marker(dcp::FFMC, dcpomatic::DCPTime::from_seconds(9.4)); - film->set_marker(dcp::LFMC, dcpomatic::DCPTime::from_seconds(9.99)); + film->set_marker(dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1.91)); + film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4)); + film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99)); film->make_dcp (); BOOST_REQUIRE (!wait_for_jobs()); @@ -131,12 +131,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) BOOST_CHECK_EQUAL (imported->markers().size(), 4U); map markers = imported->markers(); - BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end()); - BOOST_CHECK(markers[dcp::FFOC] == dcpomatic::ContentTime(184000)); - BOOST_REQUIRE(markers.find(dcp::FFMC) != markers.end()); - BOOST_CHECK(markers[dcp::FFMC] == dcpomatic::ContentTime(904000)); - BOOST_REQUIRE(markers.find(dcp::LFMC) != markers.end()); - BOOST_CHECK(markers[dcp::LFMC] == dcpomatic::ContentTime(960000)); + BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000)); + BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000)); + BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000)); /* Load that film and check that the markers have been loaded */ shared_ptr film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2"))); @@ -148,12 +148,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test) BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U); markers = reloaded->markers(); - BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end()); - BOOST_CHECK(markers[dcp::FFOC] == dcpomatic::ContentTime(184000)); - BOOST_REQUIRE(markers.find(dcp::FFMC) != markers.end()); - BOOST_CHECK(markers[dcp::FFMC] == dcpomatic::ContentTime(904000)); - BOOST_REQUIRE(markers.find(dcp::LFMC) != markers.end()); - BOOST_CHECK(markers[dcp::LFMC] == dcpomatic::ContentTime(960000)); + BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000)); + BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000)); + BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end()); + BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000)); } diff --git a/test/reels_test.cc b/test/reels_test.cc index c7b33d394..cf8dc3e2e 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -493,7 +493,7 @@ no_op () } static void -dump_notes (list const & notes) +dump_notes (vector const & notes) { for (auto i: notes) { std::cout << dcp::note_to_string(i) << "\n"; @@ -525,7 +525,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1) vector dirs; dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -555,7 +555,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2) vector dirs; dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -579,7 +579,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3) BOOST_REQUIRE (!wait_for_jobs()); vector dirs; - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } @@ -609,7 +609,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4) vector dirs; dirs.push_back (film->dir(film->dcp_name(false))); - list const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); + auto const notes = dcp::verify(dirs, boost::bind(&no_op), boost::bind(&no_op), TestPaths::xsd()); dump_notes (notes); BOOST_REQUIRE (notes.empty()); } diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc index 2eee36ffa..906477963 100644 --- a/test/subtitle_reel_test.cc +++ b/test/subtitle_reel_test.cc @@ -74,17 +74,17 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test) BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U); shared_ptr cpl = dcp.cpls().front(); - list > reels = cpl->reels (); + auto reels = cpl->reels (); BOOST_REQUIRE_EQUAL (reels.size(), 2U); - list >::const_iterator i = reels.begin (); + auto i = reels.begin (); BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr A = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + auto A = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (A); ++i; BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr B = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + auto B = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (B); BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U); diff --git a/test/torture_test.cc b/test/torture_test.cc index 23eb3ca8e..232435363 100644 --- a/test/torture_test.cc +++ b/test/torture_test.cc @@ -89,23 +89,23 @@ BOOST_AUTO_TEST_CASE (torture_test1) dcp::DCP dcp ("build/test/torture_test1/" + film->dcp_name(false)); dcp.read (); - list > cpls = dcp.cpls (); + auto cpls = dcp.cpls (); BOOST_REQUIRE_EQUAL (cpls.size(), 1U); - list > reels = cpls.front()->reels (); + auto reels = cpls.front()->reels (); BOOST_REQUIRE_EQUAL (reels.size(), 1U); /* Check sound */ - shared_ptr reel_sound = reels.front()->main_sound(); + auto reel_sound = reels.front()->main_sound(); BOOST_REQUIRE (reel_sound); - shared_ptr sound = reel_sound->asset(); + auto sound = reel_sound->asset(); BOOST_REQUIRE (sound); BOOST_CHECK_EQUAL (sound->intrinsic_duration(), 144); shared_ptr sound_reader = sound->start_read (); /* First frame silent */ - shared_ptr fr = sound_reader->get_frame (0); + auto fr = sound_reader->get_frame (0); for (int i = 0; i < fr->samples(); ++i) { for (int j = 0; j < 6; ++j) { BOOST_CHECK_EQUAL (fr->get(j, i), 0); -- cgit v1.2.3