Fix vertical alignment of subtitles in some cases (#2569).

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index ce98bf3a9509be27faca85635d678c61d10554d6..630026120736327eb22cea872c9a5772f4315f8b 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -45,6 +45,7 @@
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
+#include <dcp/equality_options.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/openjpeg_image.h>
@@ -121,6 +122,7 @@ setup_test_config ()
        Config::instance()->set_default_j2k_bandwidth (100000000);
        Config::instance()->set_default_interop (false);
        Config::instance()->set_default_still_length (10);
+       Config::instance()->set_default_dcp_audio_channels(8);
        Config::instance()->set_log_types (
                LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |
                LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK
@@ -133,6 +135,7 @@ setup_test_config ()
        decryption->set_key(dcp::file_to_string("test/data/decryption_key"));
        Config::instance()->set_decryption_chain (decryption);
        Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t"));
+       Config::instance()->set_cinemas_file("test/data/empty_cinemas.xml");
 }
 
 
@@ -155,6 +158,7 @@ struct TestConfig
 
                dcpomatic_setup ();
                setup_test_config ();
+               capture_ffmpeg_logs();
 
                EncodeServerFinder::instance()->stop ();
 
@@ -283,6 +287,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
        BOOST_REQUIRE (!ASDCP_FAILURE (check_reader.FillAudioDescriptor (check_desc)));
 
        BOOST_REQUIRE_EQUAL (ref_desc.ContainerDuration, check_desc.ContainerDuration);
+       BOOST_REQUIRE_MESSAGE(ref_desc.ChannelCount, check_desc.ChannelCount);
 
        ASDCP::PCM::FrameBuffer ref_buffer (Kumu::Megabyte);
        ASDCP::PCM::FrameBuffer check_buffer (Kumu::Megabyte);
@@ -543,7 +548,7 @@ check_dcp (boost::filesystem::path ref, shared_ptr<const Film> film)
 
 
 void
-check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
+check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound_can_differ)
 {
        dcp::DCP ref_dcp (ref);
        ref_dcp.read ();
@@ -560,8 +565,9 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
        options.asset_hashes_can_differ = true;
        options.issue_dates_can_differ = true;
        options.max_subtitle_vertical_position_error = 0.001;
+       options.sound_assets_can_differ = sound_can_differ;
 
-       BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
+       BOOST_CHECK_MESSAGE(ref_dcp.equals(check_dcp, options, boost::bind (note, _1, _2)), check << " does not match " << ref);
 }
 
 void