diff options
Diffstat (limited to 'test/kdm_test.cc')
| -rw-r--r-- | test/kdm_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/kdm_test.cc b/test/kdm_test.cc index 6f06b4c9..714d195c 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -36,13 +36,13 @@ #include "cpl.h" #include "decrypted_kdm.h" #include "encrypted_kdm.h" -#include "mono_picture_asset.h" -#include "picture_asset_writer.h" +#include "mono_j2k_picture_asset.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_mono_picture_asset.h" #include "reel_sound_asset.h" -#include "reel_smpte_subtitle_asset.h" -#include "smpte_subtitle_asset.h" +#include "reel_smpte_text_asset.h" +#include "smpte_text_asset.h" #include "test.h" #include "types.h" #include "util.h" @@ -256,9 +256,9 @@ BOOST_AUTO_TEST_CASE (validity_period_test1) auto signer = make_shared<dcp::CertificateChain>(dcp::file_to_string("test/data/certificate_chain")); signer->set_key(dcp::file_to_string("test/data/private.key")); - auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); + auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE); asset->set_key (dcp::Key()); - auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::Behaviour::MAKE_NEW); dcp::ArrayData frame ("test/data/flat_red.j2c"); writer->write (frame.data(), frame.size()); writer->finalize (); @@ -320,13 +320,13 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) ov->write_xml (); auto ov_reel = ov->cpls()[0]->reels()[0]; - auto ov_reel_picture = make_shared<dcp::ReelMonoPictureAsset>(dynamic_pointer_cast<dcp::ReelMonoPictureAsset>(ov_reel->main_picture())->mono_asset(), 0); + auto ov_reel_picture = make_shared<dcp::ReelMonoPictureAsset>(dynamic_pointer_cast<dcp::ReelMonoPictureAsset>(ov_reel->main_picture())->mono_j2k_asset(), 0); auto ov_reel_sound = make_shared<dcp::ReelSoundAsset>(ov_reel->main_sound()->asset(), 0); /* Make VF */ - auto subs = make_shared<dcp::SMPTESubtitleAsset>(); - subs->add(simple_subtitle()); + auto subs = make_shared<dcp::SMPTETextAsset>(); + subs->add(simple_text()); subs->set_key(key); boost::filesystem::remove_all (vf_path); @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) subs->add_font ("afont", data); subs->write (vf_path / "subs.xml"); - auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 192, 0); + auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::OPEN_SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0); auto reel = make_shared<dcp::Reel>(ov_reel_picture, ov_reel_sound, reel_subs); @@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) BOOST_REQUIRE_EQUAL(reload_vf.cpls()[0]->reels().size(), 1U); BOOST_REQUIRE(reload_vf.cpls()[0]->reels()[0]->main_picture()); BOOST_REQUIRE(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset()); - auto mono_asset = dynamic_pointer_cast<dcp::MonoPictureAsset>(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset()); + auto mono_asset = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset()); BOOST_REQUIRE(mono_asset); auto reader = mono_asset->start_read(); reader->set_check_hmac(false); |