diff options
Diffstat (limited to 'test/decryption_test.cc')
| -rw-r--r-- | test/decryption_test.cc | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc index d0e067ee..8dfeffa6 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -23,22 +23,23 @@ #include "mono_picture_frame.h" #include "cpl.h" #include "argb_frame.h" -#include "mono_picture_asset.h" +#include "mono_picture_mxf.h" +#include "reel_picture_asset.h" #include "reel.h" #include "test.h" using boost::dynamic_pointer_cast; using boost::shared_ptr; -static shared_ptr<const libdcp::ARGBFrame> -get_frame (libdcp::DCP const & dcp) +static shared_ptr<const dcp::ARGBFrame> +get_frame (dcp::DCP const & dcp) { - shared_ptr<const libdcp::Reel> reel = dcp.cpls().front()->reels().front (); - shared_ptr<const libdcp::PictureAsset> picture = reel->main_picture (); + shared_ptr<const dcp::Reel> reel = dcp.cpls().front()->reels().front (); + shared_ptr<dcp::PictureMXF> picture = reel->main_picture()->mxf (); BOOST_CHECK (picture); - shared_ptr<const libdcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const libdcp::MonoPictureAsset> (picture); - shared_ptr<const libdcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0); + shared_ptr<const dcp::MonoPictureMXF> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureMXF> (picture); + shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0); return j2k_frame->argb_frame (); } @@ -47,25 +48,25 @@ BOOST_AUTO_TEST_CASE (decryption_test) { boost::filesystem::path plaintext_path = private_test; plaintext_path /= "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; - libdcp::DCP plaintext (plaintext_path.string ()); + dcp::DCP plaintext (plaintext_path.string ()); plaintext.read (); BOOST_CHECK_EQUAL (plaintext.encrypted (), false); boost::filesystem::path encrypted_path = private_test; encrypted_path /= "TONEPLATES-SMPTE-ENCRYPTED_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV"; - libdcp::DCP encrypted (encrypted_path.string ()); + dcp::DCP encrypted (encrypted_path.string ()); encrypted.read (); BOOST_CHECK_EQUAL (encrypted.encrypted (), true); - libdcp::KDM kdm ( + dcp::KDM kdm ( "test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml", "test/data/private.key" ); - encrypted.add_kdm (kdm); + encrypted.add (kdm); - shared_ptr<const libdcp::ARGBFrame> plaintext_frame = get_frame (plaintext); - shared_ptr<const libdcp::ARGBFrame> encrypted_frame = get_frame (encrypted); + shared_ptr<const dcp::ARGBFrame> plaintext_frame = get_frame (plaintext); + shared_ptr<const dcp::ARGBFrame> encrypted_frame = get_frame (encrypted); /* Check that plaintext and encrypted are the same */ BOOST_CHECK_EQUAL (plaintext_frame->stride(), encrypted_frame->stride()); @@ -77,7 +78,7 @@ BOOST_AUTO_TEST_CASE (decryption_test) /** Load in a KDM that didn't work at first */ BOOST_AUTO_TEST_CASE (failing_kdm_test) { - libdcp::KDM kdm ( + dcp::KDM kdm ( "test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml", "test/data/private.key" ); |