X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=7cbe283fdc7d1a7d345bd562054505ccfb04e5d7;hb=32be167a1c74ac1e3e876ba7bac18c4890f7b4ee;hp=7be9ca549d8f0b39ac2d7d804a6123666a4fbb1a;hpb=21a14ec1358be8a2f43bc9676f445c43c76eade8;p=dcpomatic.git

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 7be9ca549..7cbe283fd 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -23,11 +23,13 @@
 
 #include <boost/test/unit_test.hpp>
 #include "lib/audio_analysis.h"
+#include "lib/analyse_audio_job.h"
 #include "lib/film.h"
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
+#include "lib/job_manager.h"
 #include "test.h"
 
 using boost::shared_ptr;
@@ -42,9 +44,9 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 {
 	int const channels = 3;
 	int const points = 4096;
-	
+
 	srand (1);
-	
+
 	AudioAnalysis a (3);
 	for (int i = 0; i < channels; ++i) {
 		for (int j = 0; j < points; ++j) {
@@ -72,7 +74,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 			BOOST_CHECK_CLOSE (p[AudioPoint::RMS],  random_float (), 1);
 		}
 	}
-	
+
 	BOOST_CHECK (b.peak ());
 	BOOST_CHECK_CLOSE (b.peak().get(), peak, 1);
 	BOOST_CHECK (b.peak_time ());
@@ -97,11 +99,13 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
-	c->analyse_audio (boost::bind (&finished));
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+	job->Finished.connect (boost::bind (&finished));
+	JobManager::instance()->add (job);
 	wait_for_jobs ();
 }
 
-/* Check that audio analysis works (i.e. runs without error) with a -ve delay */
+/** Check that audio analysis works (i.e. runs without error) with a -ve delay */
 BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 {
 	shared_ptr<Film> film = new_test_film ("audio_analysis_negative_delay_test");
@@ -110,7 +114,24 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 	c->set_audio_delay (-250);
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
-	
-	c->analyse_audio (boost::bind (&finished));
+
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+	job->Finished.connect (boost::bind (&finished));
+	JobManager::instance()->add (job);
+	wait_for_jobs ();
+}
+
+/** Check audio analysis that is incorrect in 2e98263 */
+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"));
+	film->examine_and_add_content (c);
+	wait_for_jobs ();
+
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+	job->Finished.connect (boost::bind (&finished));
+	JobManager::instance()->add (job);
 	wait_for_jobs ();
 }