diff options
Diffstat (limited to 'test/decryption_test.cc')
| -rw-r--r-- | test/decryption_test.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 8f3dbff7..3bb62d21 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -36,19 +36,19 @@ #include "dcp.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset_reader.h" -#include "mono_picture_frame.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset_reader.h" +#include "mono_j2k_picture_frame.h" #include "openjpeg_image.h" -#include "picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_file_asset.h" #include "reel_mono_picture_asset.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" -#include "reel_smpte_subtitle_asset.h" +#include "reel_smpte_text_asset.h" #include "rgb_xyz.h" -#include "smpte_subtitle_asset.h" +#include "smpte_text_asset.h" #include "sound_asset.h" #include "sound_asset_writer.h" #include "stream_operators.h" @@ -80,7 +80,7 @@ get_frame (dcp::DCP const & dcp) auto picture = reel->main_picture()->asset(); BOOST_CHECK (picture); - auto mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset>(picture); + auto mono_picture = dynamic_pointer_cast<const dcp::MonoJ2KPictureAsset>(picture); auto reader = mono_picture->start_read(); auto j2k_frame = reader->get_frame(0); auto xyz = j2k_frame->xyz_image(); @@ -152,10 +152,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2) auto context_id = dcp::make_uuid(); dcp::Key key; - auto picture_asset = std::make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); + auto picture_asset = std::make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); picture_asset->set_key (key); picture_asset->set_context_id (context_id); - auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::Behaviour::MAKE_NEW); dcp::ArrayData picture("test/data/flat_red.j2c"); for (int i = 0; i < 24; ++i) { picture_writer->write(picture); @@ -178,10 +178,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2) sound_writer->write(audio.data(), 2, 48000); sound_writer->finalize (); - auto subs_asset = std::make_shared<dcp::SMPTESubtitleAsset>(); + auto subs_asset = std::make_shared<dcp::SMPTETextAsset>(); subs_asset->set_key (key); subs_asset->set_context_id (context_id); - subs_asset->add(std::make_shared<dcp::SubtitleString>( + subs_asset->add(std::make_shared<dcp::TextString>( optional<string>(), false, false, false, dcp::Colour(255, 255, 255), @@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2) auto reel = std::make_shared<dcp::Reel>(); auto reel_picture_asset = std::make_shared<dcp::ReelMonoPictureAsset>(picture_asset, 0); auto reel_sound_asset = std::make_shared<dcp::ReelSoundAsset>(sound_asset, 0); - auto reel_subs_asset = std::make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 120, 0); + auto reel_subs_asset = std::make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs_asset, dcp::Fraction(24, 1), 120, 0); reel->add(reel_picture_asset); reel->add(reel_sound_asset); reel->add(reel_subs_asset); @@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2) BOOST_REQUIRE (reel_read->main_sound()); BOOST_CHECK (reel_read->main_sound()->asset()->key()); BOOST_REQUIRE (reel_read->main_subtitle()); - auto smpte_sub = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(reel_read->main_subtitle()->asset()); + auto smpte_sub = dynamic_pointer_cast<dcp::SMPTETextAsset>(reel_read->main_subtitle()->asset()); BOOST_REQUIRE (smpte_sub); BOOST_CHECK (smpte_sub->key()); } |