X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=7136b038d99bbb9c28bc1a8569cdb0f6b226e72f;hb=99881b1bec17a7e619b3cbf3f51d4d43e7215561;hp=27393386bd1ebdcdb266cbf0bb2580b943bec14d;hpb=08cf432a8cc9bd0289e76bf684fb5264a7cfc7a7;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 27393386b..7136b038d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -38,6 +38,7 @@ #include "lib/job.h" #include "lib/job_manager.h" #include "lib/log_entry.h" +#include "lib/make_dcp.h" #include "lib/ratio.h" #include "lib/signal_manager.h" #include "lib/util.h" @@ -99,13 +100,12 @@ boost::filesystem::path TestPaths::xsd () } -void +static void setup_test_config () { - Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency()); + Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2); 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); @@ -114,9 +114,7 @@ setup_test_config () Config::instance()->set_default_still_length (10); Config::instance()->set_log_types ( LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | - LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREE_D | - LogEntry::TYPE_DEBUG_ENCODE | LogEntry::TYPE_DEBUG_PLAYER | - LogEntry::TYPE_DISK + LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK ); Config::instance()->set_automatic_audio_analysis (false); auto signer = make_shared(dcp::file_to_string("test/data/signer_chain")); @@ -132,7 +130,7 @@ class TestSignalManager : public SignalManager { public: /* No wakes in tests: we call ui_idle ourselves */ - void wake_ui () + void wake_ui () override { } @@ -366,13 +364,15 @@ static double rms_error (boost::filesystem::path ref, boost::filesystem::path check) { - FFmpegImageProxy ref_proxy (ref, VideoRange::FULL); - auto ref_image = ref_proxy.image().image; - FFmpegImageProxy check_proxy (check, VideoRange::FULL); - auto check_image = check_proxy.image().image; + FFmpegImageProxy ref_proxy (ref); + auto ref_image = ref_proxy.image(Image::Alignment::COMPACT).image; + FFmpegImageProxy check_proxy (check); + auto check_image = check_proxy.image(Image::Alignment::COMPACT).image; + + BOOST_REQUIRE_EQUAL (ref_image->planes(), check_image->planes()); BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format()); - AVPixelFormat const format = ref_image->pixel_format(); + auto const format = ref_image->pixel_format(); BOOST_REQUIRE (ref_image->size() == check_image->size()); int const width = ref_image->size().width; @@ -419,6 +419,19 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check) } break; } + case AV_PIX_FMT_YUVJ420P: + { + for (int c = 0; c < ref_image->planes(); ++c) { + for (int y = 0; y < height / ref_image->vertical_factor(c); ++y) { + auto p = ref_image->data()[c] + y * ref_image->stride()[c]; + auto q = check_image->data()[c] + y * check_image->stride()[c]; + for (int x = 0; x < ref_image->line_size()[c]; ++x) { + sum_square += pow((*p++ - *q++), 2); + } + } + } + break; + } default: BOOST_REQUIRE_MESSAGE (false, "unrecognised pixel format " << format); } @@ -445,13 +458,13 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check, double void -check_file (boost::filesystem::path ref, boost::filesystem::path check, bool binary_mode) +check_file (boost::filesystem::path ref, boost::filesystem::path check) { auto N = boost::filesystem::file_size (ref); BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check)); - auto ref_file = fopen_boost (ref, binary_mode ? "rb" : "r"); + auto ref_file = fopen_boost (ref, "rb"); BOOST_CHECK (ref_file); - auto check_file = fopen_boost (check, binary_mode ? "rb" : "r"); + auto check_file = fopen_boost (check, "rb"); BOOST_CHECK (check_file); int const buffer_size = 65536; @@ -483,6 +496,38 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check, bool bin } +void +check_text_file (boost::filesystem::path ref, boost::filesystem::path check) +{ + auto ref_file = fopen_boost (ref, "r"); + BOOST_CHECK (ref_file); + auto check_file = fopen_boost (check, "r"); + BOOST_CHECK (check_file); + + int const buffer_size = std::max( + boost::filesystem::file_size(ref), + boost::filesystem::file_size(check) + ); + + DCPOMATIC_ASSERT (buffer_size < 1024 * 1024); + + auto ref_buffer = new uint8_t[buffer_size]; + auto ref_read = fread(ref_buffer, 1, buffer_size, ref_file); + auto check_buffer = new uint8_t[buffer_size]; + auto check_read = fread(check_buffer, 1, buffer_size, check_file); + BOOST_CHECK_EQUAL (ref_read, check_read); + + string const error = "File " + check.string() + " differs from reference " + ref.string(); + BOOST_CHECK_MESSAGE(memcmp(ref_buffer, check_buffer, ref_read) == 0, error); + + delete[] ref_buffer; + delete[] check_buffer; + + fclose (ref_file); + fclose (check_file); +} + + static void note (dcp::NoteType t, string n) { @@ -669,9 +714,9 @@ png_flush (png_structp) static void -png_error_fn (png_structp png_ptr, char const * message) +png_error_fn (png_structp, char const * message) { - reinterpret_cast(png_get_error_ptr(png_ptr))->png_error (message); + throw EncodeError (String::compose("Error during PNG write: %1", message)); } @@ -864,7 +909,7 @@ void make_and_verify_dcp (shared_ptr film, vector ignore) { film->write_metadata (); - film->make_dcp (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); BOOST_REQUIRE (!wait_for_jobs()); auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); bool ok = true; @@ -877,3 +922,24 @@ make_and_verify_dcp (shared_ptr film, vector BOOST_CHECK(ok); } + +void +check_int_close (int a, int b, int d) +{ + BOOST_CHECK_MESSAGE (std::abs(a - b) < d, a << " differs from " << b << " by more than " << d); +} + + +void +check_int_close (std::pair a, std::pair b, int d) +{ + check_int_close (a.first, b.first, d); + check_int_close (a.second, b.second, d); +} + + +ConfigRestorer::~ConfigRestorer() +{ + setup_test_config(); +} +