X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_kdm_test.cc;h=f37742c038aacdc20272f67d04c20ce0701b0813;hb=73f12506b092200418ce20d9ec70bf646d248f5d;hp=1ed5ac81061d1167d2269eb83d56dd5fa5084e10;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index 1ed5ac810..f37742c03 100644 --- a/test/vf_kdm_test.cc +++ b/test/vf_kdm_test.cc @@ -25,17 +25,19 @@ #include "test.h" #include "lib/film.h" -#include "lib/dcp_text_content.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/config.h" #include "lib/cross.h" +#include "lib/screen.h" #include #include using std::vector; +using std::string; using boost::shared_ptr; BOOST_AUTO_TEST_CASE (vf_kdm_test) @@ -48,12 +50,12 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) A->set_name ("frobozz"); A->set_interop (true); - 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_REQUIRE (!wait_for_jobs()); A->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name()); A_dcp.read (); @@ -62,10 +64,10 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) dcp::EncryptedKDM A_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 ); @@ -78,24 +80,24 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) B->set_name ("frobozz"); B->set_interop (true); - shared_ptr d (new DCPContent (B, "build/test/vf_kdm_test_ov/" + A->dcp_name())); + shared_ptr d (new DCPContent ("build/test/vf_kdm_test_ov/" + A->dcp_name())); d->add_kdm (A_kdm); d->set_reference_video (true); B->examine_and_add_content (d); B->set_encrypted (true); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); B->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name()); B_dcp.read (); dcp::EncryptedKDM B_kdm = B->make_kdm ( Config::instance()->decryption_chain()->leaf (), - vector (), + vector(), B_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 ); @@ -110,13 +112,13 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) C->set_name ("frobozz"); C->set_interop (true); - shared_ptr e (new DCPContent (C, "build/test/vf_kdm_test_vf/" + B->dcp_name())); + shared_ptr e (new DCPContent ("build/test/vf_kdm_test_vf/" + B->dcp_name())); e->add_kdm (B_kdm); e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name()); C->examine_and_add_content (e); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); C->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be 1s red, 1s green, 1s blue */ check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());