Try to capture ffmpeg logs during tests.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index dae02610014f72a75e5cf70b672f922432c375e3..402894cb17728f96f8640e4657384461c5ddbe7c 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -122,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
@@ -156,6 +157,7 @@ struct TestConfig
 
                dcpomatic_setup ();
                setup_test_config ();
+               capture_ffmpeg_logs();
 
                EncodeServerFinder::instance()->stop ();
 
@@ -284,6 +286,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);