Clean up after previous commit.

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 5923e0698fba9a60fcd35232ab8eeb6c282c3f27..b461680c398bdc0ccef88c5faf31267ffbe36525 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -18,8 +18,11 @@
 
 */
 
+/** @defgroup selfcontained Self-contained tests of single classes / method sets */
+
 /** @file  test/audio_analysis_test.cc
- *  @brief Check audio analysis code.
+ *  @brief Test AudioAnalysis class.
+ *  @ingroup selfcontained
  */
 
 #include <boost/test/unit_test.hpp>
@@ -32,8 +35,12 @@
 #include "lib/ratio.h"
 #include "lib/job_manager.h"
 #include "lib/audio_content.h"
+#include "lib/content_factory.h"
+#include "lib/playlist.h"
 #include "test.h"
+#include <iostream>
 
+using std::vector;
 using boost::shared_ptr;
 
 static float
@@ -59,9 +66,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
                }
        }
 
-       float const peak = random_float ();
-       DCPTime const peak_time = DCPTime (rand ());
-       a.set_sample_peak (peak, peak_time);
+       vector<AudioAnalysis::PeakTime> peak;
+       for (int i = 0; i < channels; ++i) {
+               peak.push_back (AudioAnalysis::PeakTime (random_float(), DCPTime (rand())));
+       }
+       a.set_sample_peak (peak);
 
        a.write ("build/test/audio_analysis_serialisation_test");
 
@@ -77,10 +86,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
                }
        }
 
-       BOOST_CHECK (b.sample_peak ());
-       BOOST_CHECK_CLOSE (b.sample_peak().get(), peak, 1);
-       BOOST_CHECK (b.sample_peak_time ());
-       BOOST_CHECK_EQUAL (b.sample_peak_time().get(), peak_time);
+       BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3);
+       for (int i = 0; i < channels; ++i) {
+               BOOST_CHECK_CLOSE (b.sample_peak()[i].peak, peak[i].peak, 1);
+               BOOST_CHECK_EQUAL (b.sample_peak()[i].time.get(), peak[i].time.get());
+       }
 }
 
 static void
@@ -101,7 +111,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
        film->examine_and_add_content (c);
        wait_for_jobs ();
 
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
        wait_for_jobs ();
@@ -118,7 +128,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 
        c->audio->set_delay (-250);
 
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
        wait_for_jobs ();
@@ -133,7 +143,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
        film->examine_and_add_content (c);
        wait_for_jobs ();
 
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist(), false));
        job->Finished.connect (boost::bind (&finished));
        JobManager::instance()->add (job);
        wait_for_jobs ();
@@ -164,7 +174,25 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 
        film->set_audio_channels (12);
        boost::signals2::connection connection;
-       JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished));
+       JobManager::instance()->analyse_audio (film, film->playlist(), false, connection, boost::bind (&analysis_finished));
        wait_for_jobs ();
        BOOST_CHECK (done);
 }
+
+/** Run an audio analysis that triggered an exception in the audio decoder at one point */
+BOOST_AUTO_TEST_CASE (analyse_audio_test4)
+{
+       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<Content> content = content_factory(film, private_data / "20 The Wedding Convoy Song.m4a").front();
+       film->examine_and_add_content (content);
+       wait_for_jobs ();
+
+       shared_ptr<Playlist> playlist (new Playlist);
+       playlist->add (content);
+       boost::signals2::connection c;
+       JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished));
+       BOOST_CHECK (!wait_for_jobs ());
+}