X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=fc5d9dc83b9d2263f47eccae4cb8e6d02a928d2f;hb=HEAD;hp=354a79e26cb60a8dc9df1ee4ba4043feed9cb487;hpb=a4c510f8e3730d918c5ba54b1b4aaf307d748e0f;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 354a79e26..fc5d9dc83 100644 --- a/test/test.cc +++ b/test/test.cc @@ -45,11 +45,14 @@ #include "test.h" #include #include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -79,6 +82,7 @@ using std::min; using std::shared_ptr; using std::string; using std::vector; +using boost::optional; using boost::scoped_array; using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 @@ -106,7 +110,7 @@ TestPaths::TestPaths::private_data () boost::filesystem::path TestPaths::xsd () { - return boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd")); + return boost::filesystem::current_path().parent_path() / "libdcp" / "xsd"; } @@ -121,6 +125,7 @@ setup_test_config () Config::instance()->set_default_j2k_bandwidth (100000000); Config::instance()->set_default_interop (false); Config::instance()->set_default_still_length (10); + Config::instance()->set_default_dcp_audio_channels(8); Config::instance()->set_log_types ( LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK @@ -132,6 +137,8 @@ setup_test_config () auto decryption = make_shared(dcp::file_to_string("test/data/decryption_chain")); decryption->set_key(dcp::file_to_string("test/data/decryption_key")); Config::instance()->set_decryption_chain (decryption); + Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t")); + Config::instance()->set_cinemas_file("test/data/empty_cinemas.xml"); } @@ -154,6 +161,7 @@ struct TestConfig dcpomatic_setup (); setup_test_config (); + capture_ffmpeg_logs(); EncodeServerFinder::instance()->stop (); @@ -282,6 +290,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check BOOST_REQUIRE (!ASDCP_FAILURE (check_reader.FillAudioDescriptor (check_desc))); BOOST_REQUIRE_EQUAL (ref_desc.ContainerDuration, check_desc.ContainerDuration); + BOOST_REQUIRE_MESSAGE(ref_desc.ChannelCount, check_desc.ChannelCount); ASDCP::PCM::FrameBuffer ref_buffer (Kumu::Megabyte); ASDCP::PCM::FrameBuffer check_buffer (Kumu::Megabyte); @@ -542,7 +551,7 @@ check_dcp (boost::filesystem::path ref, shared_ptr film) void -check_dcp (boost::filesystem::path ref, boost::filesystem::path check) +check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound_can_differ) { dcp::DCP ref_dcp (ref); ref_dcp.read (); @@ -556,10 +565,12 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check) options.cpl_annotation_texts_can_differ = true; options.reel_annotation_texts_can_differ = true; options.reel_hashes_can_differ = true; + options.asset_hashes_can_differ = true; options.issue_dates_can_differ = true; options.max_subtitle_vertical_position_error = 0.001; + options.sound_assets_can_differ = sound_can_differ; - BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2))); + BOOST_CHECK_MESSAGE(ref_dcp.equals(check_dcp, options, boost::bind (note, _1, _2)), check << " does not match " << ref); } void @@ -834,7 +845,7 @@ dcp_file (shared_ptr film, string prefix) vector matches; std::copy_if(recursive_directory_iterator(film->dir(film->dcp_name())), recursive_directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) { - return boost::algorithm::starts_with(entry.path().leaf().string(), prefix); + return boost::algorithm::starts_with(entry.path().filename().string(), prefix); }); BOOST_REQUIRE_MESSAGE(matches.size() == 1, "Found " << matches.size() << " files with prefix " << prefix); @@ -845,7 +856,7 @@ boost::filesystem::path subtitle_file (shared_ptr film) { for (auto i: boost::filesystem::recursive_directory_iterator(film->directory().get() / film->dcp_name(false))) { - if (boost::algorithm::starts_with(i.path().leaf().string(), "sub_")) { + if (boost::algorithm::starts_with(i.path().filename().string(), "sub_")) { return i.path(); } } @@ -939,7 +950,7 @@ void progress (float) {} void verify_dcp(boost::filesystem::path dir, vector ignore) { - auto notes = dcp::verify({dir}, &stage, &progress, {}, TestPaths::xsd()); + auto notes = dcp::verify({dir}, {}, &stage, &progress, {}, TestPaths::xsd()); bool ok = true; for (auto i: notes) { if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) { @@ -952,12 +963,52 @@ verify_dcp(boost::filesystem::path dir, vector igno void -make_and_verify_dcp (shared_ptr film, vector ignore) +#ifdef DCPOMATIC_LINUX +make_and_verify_dcp(shared_ptr film, vector ignore, bool dcp_inspect, bool clairmeta) +#else +make_and_verify_dcp(shared_ptr film, vector ignore, bool, bool) +#endif { film->write_metadata (); make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); verify_dcp({film->dir(film->dcp_name())}, ignore); + +#ifdef DCPOMATIC_LINUX + auto test_tools_path_env = getenv("DCPOMATIC_TEST_TOOLS_PATH"); + string test_tools_path; + if (test_tools_path_env) { + test_tools_path = test_tools_path_env; + } + + auto old_path_env = getenv("PATH"); + string old_path; + if (old_path_env) { + old_path = old_path_env; + } + + dcp::ScopeGuard sg = [old_path]() { setenv("PATH", old_path.c_str(), 1); }; + string new_path = old_path; + if (!new_path.empty()) { + new_path += ":"; + } + new_path += test_tools_path; + setenv("PATH", new_path.c_str(), 1); + + auto dcp_inspect_env = getenv("DCPOMATIC_DCP_INSPECT"); + if (dcp_inspect && dcp_inspect_env) { + boost::filesystem::path dcp_inspect(dcp_inspect_env); + auto cmd = String::compose("%1 %2 > %3 2>&1", dcp_inspect, film->dir(film->dcp_name()), film->file("dcp_inspect.log")); + auto result = system(cmd.c_str()); + BOOST_CHECK_EQUAL(WEXITSTATUS(result), 0); + } + + if (clairmeta && getenv("DCPOMATIC_CLAIRMETA")) { + auto cmd = String::compose("python3 -m clairmeta.cli check -type dcp %1 > %2 2>&1", film->dir(film->dcp_name()), film->file("clairmeta.log")); + auto result = system(cmd.c_str()); + BOOST_CHECK_EQUAL(WEXITSTATUS(result), 0); + } +#endif } @@ -988,11 +1039,11 @@ find_file (boost::filesystem::path dir, string filename_part) boost::optional found; for (auto i: boost::filesystem::directory_iterator(dir)) { if (i.path().filename().string().find(filename_part) != string::npos) { - BOOST_REQUIRE (!found); + BOOST_REQUIRE_MESSAGE(!found, "File " << filename_part << " found more than once in " << dir); found = i; } } - BOOST_REQUIRE (found); + BOOST_REQUIRE_MESSAGE(found, "Could not find " << filename_part << " in " << dir); return *found; }