diff options
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/test/test.cc b/test/test.cc index d384bdfa..51a631d2 100644 --- a/test/test.cc +++ b/test/test.cc @@ -39,11 +39,11 @@ #include "interop_subtitle_asset.h" #include "file.h" #include "j2k_transcode.h" -#include "mono_picture_asset.h" -#include "mono_picture_asset.h" +#include "mono_j2k_picture_asset.h" +#include "mono_j2k_picture_asset.h" #include "openjpeg_image.h" -#include "picture_asset_writer.h" -#include "picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" +#include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_asset.h" #include "reel_interop_closed_caption_asset.h" @@ -122,7 +122,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ()); BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ()); - if (find(ignore_tags.begin(), ignore_tags.end(), ref->get_name()) != ignore_tags.end()) { + if (find(ignore_tags.begin(), ignore_tags.end(), std::string(ref->get_name())) != ignore_tags.end()) { return; } @@ -260,18 +260,18 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) RNGFixer::RNGFixer () { - Kumu::cth_test = true; + Kumu::dcpomatic_test = true; Kumu::FortunaRNG().Reset(); } RNGFixer::~RNGFixer () { - Kumu::cth_test = false; + Kumu::dcpomatic_test = false; } -shared_ptr<dcp::MonoPictureAsset> +shared_ptr<dcp::MonoJ2KPictureAsset> simple_picture (boost::filesystem::path path, string suffix, int frames, optional<dcp::Key> key) { dcp::MXFMetadata mxf_meta; @@ -279,12 +279,12 @@ simple_picture (boost::filesystem::path path, string suffix, int frames, optiona mxf_meta.product_name = "OpenDCP"; mxf_meta.product_version = "0.0.25"; - 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_meta); if (key) { mp->set_key (*key); } - auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::PictureAsset::Behaviour::MAKE_NEW); + auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::Behaviour::MAKE_NEW); dcp::Size const size (1998, 1080); auto image = make_shared<dcp::OpenJPEGImage>(size); @@ -530,10 +530,10 @@ black_picture_asset (boost::filesystem::path dir, int frames) auto frame = dcp::compress_j2k (image, 100000000, 24, false, false); BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8)); - 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_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel")); boost::filesystem::create_directories (dir); - auto writer = asset->start_write(dir / "pic.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW); + auto writer = asset->start_write(dir / "pic.mxf", dcp::Behaviour::MAKE_NEW); for (int i = 0; i < frames; ++i) { writer->write (frame.data(), frame.size()); } @@ -567,7 +567,11 @@ Editor::Editor(boost::filesystem::path path) Editor::~Editor() { - auto f = fopen(_path.string().c_str(), "w"); + /* Open this binary so that text files are re-written with Unix endings even on Windows, + * so that if we subsequently get hashes of edited files the hashes are the same on + * all platforms. + */ + auto f = fopen(_path.string().c_str(), "wb"); BOOST_REQUIRE (f); fwrite (_content.c_str(), _content.length(), 1, f); fclose (f); |