X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=b461680c398bdc0ccef88c5faf31267ffbe36525;hb=99bcbf1e71585a13c00d9696284d5a1e71913fbd;hp=278ea06d9962701562ece6545735bff644d653ef;hpb=02cc8c7680381c123a31c23a43f6b34a04c2115a;p=dcpomatic.git

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 278ea06d9..b461680c3 100644
--- 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>
@@ -35,7 +38,9 @@
 #include "lib/content_factory.h"
 #include "lib/playlist.h"
 #include "test.h"
+#include <iostream>
 
+using std::vector;
 using boost::shared_ptr;
 
 static float
@@ -61,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");
 
@@ -79,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
@@ -103,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 ();
@@ -120,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 ();
@@ -135,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 ();
@@ -166,7 +174,7 @@ 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);
 }
@@ -178,13 +186,13 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
 	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");
+	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, c, boost::bind (&finished));
+	JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished));
 	BOOST_CHECK (!wait_for_jobs ());
 }