Fix test crash.

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index c2c06734af922e9f64e399201841d692bcaaf9a9..4069471db4018736f5d8ecbabcd7c1934def9d60 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
 #include "lib/job_manager.h"
+#include "lib/audio_content.h"
 #include "test.h"
 
 using boost::shared_ptr;
@@ -110,11 +111,12 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 {
        shared_ptr<Film> film = new_test_film ("audio_analysis_negative_delay_test");
        film->set_name ("audio_analysis_negative_delay_test");
-       shared_ptr<AudioContent> c (new FFmpegContent (film, private_data / "boon_telly.mkv"));
-       c->set_audio_delay (-250);
+       shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "boon_telly.mkv"));
        film->examine_and_add_content (c);
        wait_for_jobs ();
 
+       c->audio->set_delay (-250);
+
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
@@ -126,7 +128,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
 {
        shared_ptr<Film> film = new_test_film ("audio_analysis_test2");
        film->set_name ("audio_analysis_test2");
-       shared_ptr<AudioContent> c (new FFmpegContent (film, private_data / "3d_thx_broadway_2010_lossless.m2ts"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "3d_thx_broadway_2010_lossless.m2ts"));
        film->examine_and_add_content (c);
        wait_for_jobs ();
 
@@ -135,3 +137,33 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
        JobManager::instance()->add (job);
        wait_for_jobs ();
 }
+
+
+static bool done = false;
+
+static void
+analysis_finished ()
+{
+       done = true;
+}
+
+/* Test a case which was reported to throw an exception; analysing
+ * a 12-channel DCP's audio.
+ */
+BOOST_AUTO_TEST_CASE (audio_analysis_test3)
+{
+       shared_ptr<Film> film = new_test_film ("analyse_audio_test");
+       film->set_container (Ratio::from_id ("185"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+       film->set_name ("frobozz");
+
+       shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/white.wav"));
+       film->examine_and_add_content (content);
+       wait_for_jobs ();
+
+       film->set_audio_channels (12);
+       boost::signals2::connection connection;
+       JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished));
+       wait_for_jobs ();
+       BOOST_CHECK (done);
+}