diff options
Diffstat (limited to 'test/encryption_test.cc')
| -rw-r--r-- | test/encryption_test.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 358a3fd9..3af0e24d 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -31,23 +31,24 @@ files in the program, then also delete it here. */ -#include "metadata.h" + #include "certificate.h" -#include "dcp.h" #include "certificate_chain.h" #include "cpl.h" +#include "dcp.h" +#include "decrypted_kdm.h" +#include "encrypted_kdm.h" #include "filesystem.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" -#include "sound_asset_writer.h" -#include "sound_asset.h" +#include "j2k_picture_asset_writer.h" +#include "metadata.h" +#include "mono_j2k_picture_asset.h" #include "reel.h" -#include "test.h" -#include "subtitle_asset.h" #include "reel_mono_picture_asset.h" #include "reel_sound_asset.h" -#include "encrypted_kdm.h" -#include "decrypted_kdm.h" +#include "sound_asset.h" +#include "sound_asset_writer.h" +#include "test.h" +#include "text_asset.h" #include <asdcp/KM_util.h> #include <sndfile.h> #include <boost/test/unit_test.hpp> @@ -90,11 +91,11 @@ BOOST_AUTO_TEST_CASE (encryption_test) dcp::Key key; - auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE); + auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE); mp->set_metadata (mxf_metadata); mp->set_key (key); - auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::Behaviour::MAKE_NEW); dcp::ArrayData j2c ("test/data/flat_red.j2c"); for (int i = 0; i < 24; ++i) { writer->write (j2c.data (), j2c.size ()); @@ -126,7 +127,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) cpl->add (make_shared<dcp::Reel>( make_shared<dcp::ReelMonoPictureAsset>(mp, 0), make_shared<dcp::ReelSoundAsset>(ms, 0), - shared_ptr<dcp::ReelSubtitleAsset>() + shared_ptr<dcp::ReelTextAsset>() )); cpl->set_content_version ( dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00") |