X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=b111a3b6b85a62dfe591e81aac2c78c2aae822b1;hp=551f64dbde9bd74755e6672a6af4ce7724922cb7;hb=ffe35585f08d0a5aeccf3e32f9c4cd2a5a6f43f5;hpb=ec6b451c615134984688a2085d6c3f9fcfa870bc diff --git a/test/test.cc b/test/test.cc index 551f64dbd..b111a3b6b 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -34,6 +34,10 @@ #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "lib/log_entry.h" +#include "lib/compose.hpp" +#include "lib/file_log.h" +#include "lib/dcpomatic_log.h" +#include "test.h" #include #include #include @@ -67,7 +71,8 @@ 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")); +boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd")); void setup_test_config () @@ -111,6 +116,8 @@ struct TestConfig if (env_private) { private_data = env_private; } + + dcpomatic_log.reset (new FileLog("build/test/log")); } ~TestConfig () @@ -229,13 +236,9 @@ 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; -#else - using namespace MagickLib; -#endif Magick::Image ref_image; ref_image.read (ref.string ()); @@ -244,12 +247,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check) /* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it; this may cause random test failures on platforms that use GraphicsMagick. */ -#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); -#else - BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check); -#endif + BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist); } void @@ -391,7 +390,7 @@ wait_for_jobs () JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) { while (signal_manager->ui_idle ()) {} - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); } if (jm->errors ()) { @@ -423,22 +422,18 @@ wait_for_jobs () } void -write_image (shared_ptr image, boost::filesystem::path file, string format) +write_image (shared_ptr image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type) { -#ifdef DCPOMATIC_IMAGE_MAGICK - using namespace MagickCore; -#else - using namespace MagickLib; -#endif + using namespace MagickCore; - Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]); + Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]); m.write (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); } @@ -450,19 +445,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 @@ -476,3 +474,52 @@ 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); + /* Remove warning */ + return boost::filesystem::path("/"); +} + +void +make_random_file (boost::filesystem::path path, size_t size) +{ + size_t const chunk = 128 * 1024; + uint8_t* buffer = static_cast (malloc(chunk)); + BOOST_REQUIRE (buffer); + FILE* r = fopen("/dev/urandom", "rb"); + BOOST_REQUIRE (r); + FILE* t = fopen_boost(path, "wb"); + BOOST_REQUIRE (t); + while (size) { + size_t this_time = min (size, chunk); + size_t N = fread (buffer, 1, this_time, r); + BOOST_REQUIRE (N == this_time); + N = fwrite (buffer, 1, this_time, t); + BOOST_REQUIRE (N == this_time); + size -= this_time; + } + fclose (t); + fclose (r); + free (buffer); +}