X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=b2a0cd5acfcaad18aaca3c13bcae9b13e46202e9;hb=68397475b07181446d9593ca65c88c6261934afd;hp=02b567237b01dd20f9d4251686172872689af442;hpb=dea555a6d395e74c20436123a5f3b5bd623ebcf6;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 02b567237..b2a0cd5ac 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -110,7 +110,6 @@ setup_test_config ()
 	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_container (Ratio::from_id ("185"));
 	Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 	Config::instance()->set_default_audio_delay (0);
 	Config::instance()->set_default_j2k_bandwidth (100000000);
@@ -283,7 +282,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 	for (size_t i = 0; i < ref_desc.ContainerDuration; ++i) {
 		ref_reader.ReadFrame (i, ref_buffer, 0);
 		check_reader.ReadFrame (i, check_buffer, 0);
-		BOOST_REQUIRE (memcmp(ref_buffer.RoData(), check_buffer.RoData(), ref_buffer.Size()) == 0);
+		BOOST_REQUIRE_MESSAGE(memcmp(ref_buffer.RoData(), check_buffer.RoData(), ref_buffer.Size()) == 0, "Audio MXF differs in frame " << i);
 	}
 }
 
@@ -552,6 +551,7 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 	options.reel_annotation_texts_can_differ = true;
 	options.reel_hashes_can_differ = true;
 	options.issue_dates_can_differ = true;
+	options.max_subtitle_vertical_position_error = 0.001;
 
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }