X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=93cd5ee14de923030e22a9c32c2758133fc26e24;hb=fa2c49210c9fcf0f26205927aec0aceb13ca69ce;hp=76678b74be4ba77bd0957dfb2e6b8a0b1ceda7a2;hpb=a840ce739c75e1d5c84cd1956698f4ee0d1e1b2b;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 76678b74b..93cd5ee14 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -34,6 +34,8 @@ #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "lib/log_entry.h" +#include "lib/compose.hpp" +#include "test.h" #include #include #include @@ -67,7 +69,24 @@ using boost::shared_ptr; using boost::scoped_array; using boost::dynamic_pointer_cast; -boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"); +boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private")); + +void +setup_test_config () +{ + Config::instance()->set_master_encoding_threads (1); + Config::instance()->set_server_encoding_threads (1); + Config::instance()->set_server_port_base (61921); + Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); + Config::instance()->set_default_container (Ratio::from_id ("185")); + Config::instance()->set_default_dcp_content_type (static_cast (0)); + Config::instance()->set_default_audio_delay (0); + Config::instance()->set_default_j2k_bandwidth (100000000); + Config::instance()->set_default_interop (false); + Config::instance()->set_default_still_length (10); + Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); + Config::instance()->set_automatic_audio_analysis (false); +} class TestSignalManager : public SignalManager { @@ -84,19 +103,7 @@ struct TestConfig TestConfig () { dcpomatic_setup (); - - Config::instance()->set_master_encoding_threads (1); - Config::instance()->set_server_encoding_threads (1); - Config::instance()->set_server_port_base (61921); - Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); - Config::instance()->set_default_container (Ratio::from_id ("185")); - Config::instance()->set_default_dcp_content_type (static_cast (0)); - Config::instance()->set_default_audio_delay (0); - Config::instance()->set_default_j2k_bandwidth (100000000); - Config::instance()->set_default_interop (false); - Config::instance()->set_default_still_length (10); - Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); - Config::instance()->set_automatic_audio_analysis (false); + setup_test_config (); EncodeServerFinder::instance()->stop (); @@ -224,7 +231,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check } void -check_image (boost::filesystem::path ref, boost::filesystem::path check) +check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold) { #ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; @@ -241,7 +248,7 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check) */ #ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric); - BOOST_CHECK_MESSAGE (dist < 0.01, ref << " differs from " << check << " " << dist); + BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist); #else BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check); #endif @@ -431,9 +438,9 @@ write_image (shared_ptr image, boost::filesystem::path file, string } void -check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check) +check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance) { - int const r = system (string("ffcmp " + ref.string() + " " + check.string()).c_str()); + int const r = system (String::compose("ffcmp -t %1 %2 %3", audio_tolerance, ref.string(), check.string()).c_str()); BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0); } @@ -445,19 +452,22 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst shared_ptr asset = dynamic_pointer_cast (dcp.cpls().front()->reels().front()->main_picture()->asset()); BOOST_REQUIRE (asset); shared_ptr frame = asset->start_read()->get_frame(index); + shared_ptr ref_frame (new dcp::MonoPictureFrame (ref)); - boost::uintmax_t const ref_size = boost::filesystem::file_size(ref); - BOOST_CHECK_EQUAL (frame->j2k_size(), ref_size); + shared_ptr image = frame->xyz_image (); + shared_ptr ref_image = ref_frame->xyz_image (); - FILE* ref_file = fopen_boost(ref, "rb"); - BOOST_REQUIRE (ref_file); + BOOST_REQUIRE (image->size() == ref_image->size()); - uint8_t* ref_data = new uint8_t[ref_size]; - fread (ref_data, ref_size, 1, ref_file); - fclose (ref_file); - - BOOST_CHECK (memcmp(ref_data, frame->j2k_data(), ref_size) == 0); - delete[] ref_data; + int off = 0; + for (int y = 0; y < ref_image->size().height; ++y) { + for (int x = 0; x < ref_image->size().width; ++x) { + BOOST_REQUIRE_EQUAL (ref_image->data(0)[off], image->data(0)[off]); + BOOST_REQUIRE_EQUAL (ref_image->data(1)[off], image->data(1)[off]); + BOOST_REQUIRE_EQUAL (ref_image->data(2)[off], image->data(2)[off]); + ++off; + } + } } boost::filesystem::path @@ -471,3 +481,27 @@ dcp_file (shared_ptr film, string prefix) BOOST_REQUIRE (i != boost::filesystem::directory_iterator()); return i->path(); } + +boost::filesystem::path +subtitle_file (shared_ptr film) +{ + for ( + boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false)); + i != boost::filesystem::directory_iterator (); + ++i) { + + if (boost::filesystem::is_directory (i->path ())) { + for ( + boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ()); + j != boost::filesystem::directory_iterator (); + ++j) { + + if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) { + return j->path(); + } + } + } + } + + BOOST_REQUIRE (false); +}