X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=9da2867462c81cd66da4c424265a94cfa81466a5;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=a2da8d6900122d7bc9156173216f147f608e2a57;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index a2da8d690..9da286746 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -41,7 +41,8 @@
 #include <iostream>
 
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
 
 static float
 random_float ()
@@ -54,8 +55,6 @@ 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) {
@@ -76,19 +75,18 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 	a.set_sample_rate (48000);
 	a.write ("build/test/audio_analysis_serialisation_test");
 
-	srand (1);
-
 	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) {
-			AudioPoint p = b.get_point (i, j);
-			BOOST_CHECK_CLOSE (p[AudioPoint::PEAK], random_float (), 1);
-			BOOST_CHECK_CLOSE (p[AudioPoint::RMS],  random_float (), 1);
+			AudioPoint p = a.get_point (i, j);
+			AudioPoint q = b.get_point (i, j);
+			BOOST_CHECK_CLOSE (p[AudioPoint::PEAK], q[AudioPoint::PEAK], 1);
+			BOOST_CHECK_CLOSE (p[AudioPoint::RMS],  q[AudioPoint::RMS], 1);
 		}
 	}
 
-	BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3);
+	BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3U);
 	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());
@@ -110,7 +108,7 @@ BOOST_AUTO_TEST_CASE (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";
+	boost::filesystem::path p = TestPaths::private_data() / "betty_L.wav";
 
 	shared_ptr<FFmpegContent> c (new FFmpegContent(p));
 	film->examine_and_add_content (c);
@@ -127,7 +125,7 @@ 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<FFmpegContent> c (new FFmpegContent(private_data / "boon_telly.mkv"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -144,7 +142,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<FFmpegContent> c (new FFmpegContent(private_data / "3d_thx_broadway_2010_lossless.m2ts"));
+	shared_ptr<FFmpegContent> c (new FFmpegContent(TestPaths::private_data() / "3d_thx_broadway_2010_lossless.m2ts"));
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -191,7 +189,7 @@ 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(private_data / "20 The Wedding Convoy Song.m4a").front();
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "20 The Wedding Convoy Song.m4a").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -201,3 +199,23 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
 	JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished));
 	BOOST_CHECK (!wait_for_jobs ());
 }
+
+BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
+{
+	shared_ptr<Film> film = new_test_film2 ("analyse_audio_leqm_test");
+	film->set_audio_channels (2);
+	shared_ptr<Content> content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav").front();
+	film->examine_and_add_content (content);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	shared_ptr<Playlist> playlist (new Playlist);
+	playlist->add (film, content);
+	boost::signals2::connection c;
+	JobManager::instance()->analyse_audio (film, playlist, false, c, boost::bind (&finished));
+	BOOST_CHECK (!wait_for_jobs());
+
+	AudioAnalysis analysis(film->audio_analysis_path(playlist));
+
+	/* The CLI tool of leqm_nrt gives this value for betty_stereo_48k.wav */
+	BOOST_CHECK_CLOSE (analysis.leqm().get_value_or(0), 88.276, 0.001);
+}