X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=83dd0c6de043b8b35803e6b65987e3d1109fae38;hp=775752c5cc1a1a1fd60371a127085346ca9746ff;hb=e81c5eb9e8ff875240dde9fdaaab0a46f99af615;hpb=142f688c0ebb6938ef2d7f2b7e7c859d12af7e23 diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 775752c5c..83dd0c6de 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -25,18 +25,26 @@ #include "test.h" #include "lib/film.h" +#include "lib/screen.h" #include "lib/dcp_subtitle_content.h" #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" +#include "lib/examine_content_job.h" +#include "lib/job_manager.h" #include "lib/config.h" #include "lib/cross.h" +#include "lib/video_content.h" +#include "lib/content_factory.h" #include #include using std::vector; +using std::string; +using std::map; using boost::shared_ptr; +using boost::dynamic_pointer_cast; /** Make an encrypted DCP, import it and make a new unencrypted DCP */ BOOST_AUTO_TEST_CASE (import_dcp_test) @@ -47,25 +55,26 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) A->set_name ("frobozz"); A->set_interop (false); - shared_ptr c (new FFmpegContent (A, "test/data/test.mp4")); + shared_ptr c (new FFmpegContent("test/data/test.mp4")); A->examine_and_add_content (c); A->set_encrypted (true); - wait_for_jobs (); + BOOST_CHECK (!wait_for_jobs ()); A->make_dcp (); - wait_for_jobs (); + BOOST_CHECK (!wait_for_jobs ()); dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name()); A_dcp.read (); Config::instance()->set_decryption_chain (shared_ptr (new dcp::CertificateChain (openssl_path ()))); + /* Dear future-carl: I suck! I thought you wouldn't still be running these tests in 2030! Sorry! */ dcp::EncryptedKDM kdm = A->make_kdm ( Config::instance()->decryption_chain()->leaf (), - vector (), + vector(), A_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2014-07-21T00:00:00+00:00"), - dcp::LocalTime ("2024-07-21T00:00:00+00:00"), + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), dcp::MODIFIED_TRANSITIONAL_1, true, 0 ); @@ -76,14 +85,114 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) B->set_name ("frobozz"); B->set_interop (false); - shared_ptr d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); - d->add_kdm (kdm); + shared_ptr d (new DCPContent("build/test/import_dcp_test/" + A->dcp_name())); B->examine_and_add_content (d); - wait_for_jobs (); + BOOST_CHECK (!wait_for_jobs ()); + d->add_kdm (kdm); + JobManager::instance()->add (shared_ptr (new ExamineContentJob (B, d))); + BOOST_CHECK (!wait_for_jobs ()); B->make_dcp (); - wait_for_jobs (); + BOOST_CHECK (!wait_for_jobs ()); /* Should be 1s red, 1s green, 1s blue */ check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name()); } + + +/** Check that DCP markers are imported correctly */ +BOOST_AUTO_TEST_CASE (import_dcp_markers_test) +{ + /* Make a DCP with some markers */ + shared_ptr film = new_test_film2 ("import_dcp_markers_test"); + shared_ptr content = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + + 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->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Import the DCP to a new film and check the markers */ + shared_ptr film2 = new_test_film2 ("import_dcp_markers_test2"); + shared_ptr imported (new DCPContent(film->dir(film->dcp_name()))); + film2->examine_and_add_content (imported); + BOOST_REQUIRE (!wait_for_jobs()); + film2->write_metadata (); + + BOOST_CHECK_EQUAL (imported->markers().size(), 3); + + 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)); + + /* 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"))); + film3->read_metadata (); + BOOST_REQUIRE (film3->content().size() == 1); + shared_ptr reloaded = dynamic_pointer_cast(film3->content().front()); + BOOST_REQUIRE (reloaded); + + BOOST_CHECK_EQUAL (reloaded->markers().size(), 3); + + 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)); +} + + +/** Check that DCP metadata (ratings and content version) are imported correctly */ +BOOST_AUTO_TEST_CASE (import_dcp_metadata_test) +{ + /* Make a DCP with some ratings and a content version */ + shared_ptr film = new_test_film2 ("import_dcp_metadata_test"); + shared_ptr content = content_factory("test/data/flat_red.png").front(); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + + content->video->set_length (10); + + std::vector ratings; + ratings.push_back (dcp::Rating("BBFC", "15")); + ratings.push_back (dcp::Rating("MPAA", "NC-17")); + film->set_ratings (ratings); + + film->set_content_version ("Fred"); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); + + /* Import the DCP to a new film and check the metadata */ + shared_ptr film2 = new_test_film2 ("import_dcp_metadata_test2"); + shared_ptr imported (new DCPContent(film->dir(film->dcp_name()))); + film2->examine_and_add_content (imported); + BOOST_REQUIRE (!wait_for_jobs()); + film2->write_metadata (); + + BOOST_CHECK (imported->ratings() == ratings); + BOOST_CHECK_EQUAL (imported->content_version(), "Fred"); + + /* Load that film and check that the metadata has been loaded */ + shared_ptr film3(new Film(boost::filesystem::path("build/test/import_dcp_metadata_test2"))); + film3->read_metadata (); + BOOST_REQUIRE (film3->content().size() == 1); + shared_ptr reloaded = dynamic_pointer_cast(film3->content().front()); + BOOST_REQUIRE (reloaded); + + BOOST_CHECK (reloaded->ratings() == ratings); + BOOST_CHECK_EQUAL (reloaded->content_version(), "Fred"); +} +