X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=cfac511b32e9e78f285eab944e58f8436b781a5c;hp=1f5247392a461b6dd90033b4189a7a18c2f02b7c;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=3abb4fb830aec21664fe84277d9da695935ac5ce diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 1f5247392..cfac511b3 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-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,16 @@ */ + /** @file test/import_dcp_test.cc * @brief Test import of encrypted DCPs. - * @ingroup specific + * @ingroup feature */ + #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" @@ -34,60 +37,162 @@ #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 boost::shared_ptr; +using std::string; +using std::map; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::make_shared; + /** Make an encrypted DCP, import it and make a new unencrypted DCP */ BOOST_AUTO_TEST_CASE (import_dcp_test) { - shared_ptr A = new_test_film ("import_dcp_test"); + ConfigRestorer cr; + + auto A = new_test_film ("import_dcp_test"); A->set_container (Ratio::from_id ("185")); A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); A->set_name ("frobozz"); A->set_interop (false); - shared_ptr c (new FFmpegContent (A, "test/data/test.mp4")); + auto c = make_shared("test/data/test.mp4"); A->examine_and_add_content (c); A->set_encrypted (true); BOOST_CHECK (!wait_for_jobs ()); - A->make_dcp (); - BOOST_CHECK (!wait_for_jobs ()); + make_and_verify_dcp (A); 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 ()))); + Config::instance()->set_decryption_chain (make_shared(openssl_path(), CERTIFICATE_VALIDITY_PERIOD)); - dcp::EncryptedKDM kdm = A->make_kdm ( + auto 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::MODIFIED_TRANSITIONAL_1, + dcp::LocalTime ("2030-07-21T00:00:00+00:00"), + dcp::LocalTime ("2031-07-21T00:00:00+00:00"), + dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0 ); - shared_ptr B = new_test_film ("import_dcp_test2"); + auto B = new_test_film ("import_dcp_test2"); B->set_container (Ratio::from_id ("185")); B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); B->set_name ("frobozz"); B->set_interop (false); - shared_ptr d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); + auto d = make_shared("build/test/import_dcp_test/" + A->dcp_name()); B->examine_and_add_content (d); BOOST_CHECK (!wait_for_jobs ()); d->add_kdm (kdm); - JobManager::instance()->add (shared_ptr (new ExamineContentJob (B, d))); + JobManager::instance()->add (make_shared(B, d)); BOOST_CHECK (!wait_for_jobs ()); - B->make_dcp (); - BOOST_CHECK (!wait_for_jobs ()); + make_and_verify_dcp (B); /* 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) +{ + Cleanup cl; + + /* Make a DCP with some markers */ + auto content = content_factory("test/data/flat_red.png").front(); + auto film = new_test_film2 ("import_dcp_markers_test", {content}, &cl); + + content->video->set_length (24 * 60 * 10); + + film->set_marker(dcp::Marker::FFOC, dcpomatic::DCPTime::from_frames(1, 24)); + film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4)); + film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99)); + + make_and_verify_dcp (film); + + /* Import the DCP to a new film and check the markers */ + auto imported = make_shared(film->dir(film->dcp_name())); + auto film2 = new_test_film2 ("import_dcp_markers_test2", {imported}, &cl); + film2->write_metadata (); + + /* When import_dcp_markers_test was made a LFOC marker will automatically + * have been added. + */ + BOOST_CHECK_EQUAL (imported->markers().size(), 4U); + + auto markers = imported->markers(); + 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 */ + auto film3 = make_shared(boost::filesystem::path("build/test/import_dcp_markers_test2")); + film3->read_metadata (); + BOOST_REQUIRE_EQUAL (film3->content().size(), 1U); + auto reloaded = dynamic_pointer_cast(film3->content().front()); + BOOST_REQUIRE (reloaded); + + BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U); + + markers = reloaded->markers(); + 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)); + + cl.run (); +} + + +/** 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 */ + auto film = new_test_film2 ("import_dcp_metadata_test"); + auto 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); + + vector ratings = { {"BBFC", "15"}, {"MPAA", "NC-17"} }; + film->set_ratings (ratings); + + vector cv = { "Fred "}; + film->set_content_versions (cv); + + make_and_verify_dcp (film); + + /* Import the DCP to a new film and check the metadata */ + auto film2 = new_test_film2 ("import_dcp_metadata_test2"); + auto imported = make_shared(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 (imported->content_versions() == cv); + + /* Load that film and check that the metadata has been loaded */ + auto film3 = make_shared(boost::filesystem::path("build/test/import_dcp_metadata_test2")); + film3->read_metadata (); + BOOST_REQUIRE_EQUAL (film3->content().size(), 1U); + auto reloaded = dynamic_pointer_cast(film3->content().front()); + BOOST_REQUIRE (reloaded); + + BOOST_CHECK (reloaded->ratings() == ratings); + BOOST_CHECK (reloaded->content_versions() == cv); +} +