X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=fb70f3e7d03c0f8079b8714e0dfc43867b6acfc9;hp=13a8dac8436e3fe832e064f11411ea7c051711b5;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 13a8dac84..fb70f3e7d 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -18,11 +18,21 @@
 */
 
 /** @file  test/audio_analysis_test.cc
- *  @brief Check serialisation of audio analyses.
+ *  @brief Check audio analysis code.
  */
 
 #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;
 
 static float
 random_float ()
@@ -30,7 +40,7 @@ random_float ()
 	return (float (rand ()) / RAND_MAX) * 2 - 1;
 }
 
-BOOST_AUTO_TEST_CASE (audio_analysis_test)
+BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 {
 	int const channels = 3;
 	int const points = 4096;
@@ -47,11 +57,15 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 		}
 	}
 
-	a.write ("build/test/audio_analysis_test");
+	float const peak = random_float ();
+	DCPTime const peak_time = DCPTime (rand ());
+	a.set_peak (peak, peak_time);
+
+	a.write ("build/test/audio_analysis_serialisation_test");
 
 	srand (1);
 
-	AudioAnalysis b ("build/test/audio_analysis_test");
+	AudioAnalysis b ("build/test/audio_analysis_serialisation_test");
 	for (int i = 0; i < channels; ++i) {
 		BOOST_CHECK_EQUAL (b.points(i), points);
 		for (int j = 0; j < points; ++j) {
@@ -60,4 +74,49 @@ BOOST_AUTO_TEST_CASE (audio_analysis_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 ());
+	BOOST_CHECK_EQUAL (b.peak_time().get(), peak_time);
+}
+
+static void
+finished ()
+{
+
+}
+
+BOOST_AUTO_TEST_CASE (audio_analysis_test)
+{
+	shared_ptr<Film> film = new_test_film ("audio_analysis_test");
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_name ("audio_analysis_test");
+	boost::filesystem::path p = private_data / "betty_L.wav";
+
+	shared_ptr<SndfileContent> c (new SndfileContent (film, p));
+	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 ();
+}
+
+/* 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");
+	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);
+	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 ();
 }