diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-16 15:38:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-12 11:05:26 +0100 |
| commit | dbfbdcba0f5f08a932ba199039f2ca1530e482ac (patch) | |
| tree | 94b52a2b51229a2030280db9d259cb52897658ab /test | |
| parent | 9610f4035114f499d098e8fd2d726d55ddd943ee (diff) | |
Basics of reel split.
Diffstat (limited to 'test')
| -rw-r--r-- | test/import_dcp_test.cc | 9 | ||||
| -rw-r--r-- | test/recover_test.cc | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index 84d02c0bf..45cd9f413 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -17,8 +17,7 @@ */ -#include <boost/test/unit_test.hpp> -#include <dcp/cpl.h> +#include "test.h" #include "lib/film.h" #include "lib/dcp_subtitle_content.h" #include "lib/ratio.h" @@ -26,7 +25,9 @@ #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" #include "lib/config.h" -#include "test.h" +#include "lib/cross.h" +#include <dcp/cpl.h> +#include <boost/test/unit_test.hpp> using boost::shared_ptr; @@ -49,6 +50,8 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name()); A_dcp.read (); + Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ()))); + dcp::EncryptedKDM kdm = A->make_kdm ( Config::instance()->decryption_chain()->leaf (), A_dcp.cpls().front()->file (), diff --git a/test/recover_test.cc b/test/recover_test.cc index 3b31a6f8d..b650aba64 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d) film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_d2b23c22cff43b0247c7108dcd32323c_24_100000000_P_S.mxf"; + boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_d2b23c22cff43b0247c7108dcd32323c_24_100000000_P_S_0_1200000.mxf"; boost::filesystem::copy_file ( video, @@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d) film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf"; boost::filesystem::copy_file ( video, |