Fix incorrect sign on boost test constants.

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 5d65ab693c5f6cbd7394e123cb0aaf2b9f057637..4613f4aead464f40b8d5f5b9fbc190f31633d81d 100644 (file)
--- 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.
 
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
                }
        }
 
-       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());
@@ -111,7 +111,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);
@@ -128,7 +128,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());
 
@@ -145,7 +145,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());
 
@@ -192,7 +192,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());
 
@@ -202,3 +202,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);
+}