X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=8417b30d2ec197111fb809958ee111b7fa5d2171;hb=refs%2Fheads%2Fbetter-gl;hp=e6a97e06ac507720aefa1224331c0eb5f38c8b4c;hpb=fe6852642d35481e56caa2b40dacf0001f48a79d;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index e6a97e06a..8417b30d2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -113,9 +113,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::CertificateChain>(dcp::file_to_string("test/data/signer_chain"));
@@ -365,10 +363,10 @@ 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->pixel_format(), check_image->pixel_format());
 	AVPixelFormat const format = ref_image->pixel_format();
@@ -912,7 +910,7 @@ make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code>
 void
 check_int_close (int a, int b, int d)
 {
-	BOOST_CHECK (std::abs(a - b) < d);
+	BOOST_CHECK_MESSAGE (std::abs(a - b) < d, a << " differs from " << b << " by more than " << d);
 }