X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=4613f4aead464f40b8d5f5b9fbc190f31633d81d;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hp=695e240b7d5c26db7b4f0fcbeddb84c6df229c65;hpb=257f36fea6aed378c3060c1789294b68b317a456;p=dcpomatic.git diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 695e240b7..4613f4aea 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -42,6 +42,7 @@ using std::vector; using boost::shared_ptr; +using namespace dcpomatic; static float random_float () @@ -72,6 +73,8 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test) } a.set_sample_peak (peak); + a.set_samples_per_point (100); + a.set_sample_rate (48000); a.write ("build/test/audio_analysis_serialisation_test"); srand (1); @@ -86,11 +89,14 @@ 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()); } + + BOOST_CHECK_EQUAL (a.samples_per_point(), 100); + BOOST_CHECK_EQUAL (a.sample_rate(), 48000); } static void @@ -105,17 +111,16 @@ 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"); - std::cout << "HELLO! " << geteuid() << "\n"; - boost::filesystem::path p = private_data / "betty_L.wav"; + boost::filesystem::path p = TestPaths::private_data / "betty_L.wav"; - shared_ptr c (new FFmpegContent (film, p)); + shared_ptr c (new FFmpegContent(p)); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); + shared_ptr job (new AnalyseAudioJob (film, film->playlist(), false)); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); } /** Check that audio analysis works (i.e. runs without error) with a -ve delay */ @@ -123,16 +128,16 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test) { shared_ptr film = new_test_film ("audio_analysis_negative_delay_test"); film->set_name ("audio_analysis_negative_delay_test"); - shared_ptr c (new FFmpegContent (film, private_data / "boon_telly.mkv")); + shared_ptr c (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); c->audio->set_delay (-250); - shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); + shared_ptr job (new AnalyseAudioJob (film, film->playlist(), false)); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); } /** Check audio analysis that is incorrect in 2e98263 */ @@ -140,14 +145,14 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2) { shared_ptr film = new_test_film ("audio_analysis_test2"); film->set_name ("audio_analysis_test2"); - shared_ptr c (new FFmpegContent (film, private_data / "3d_thx_broadway_2010_lossless.m2ts")); + shared_ptr c (new FFmpegContent(TestPaths::private_data / "3d_thx_broadway_2010_lossless.m2ts")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); + shared_ptr job (new AnalyseAudioJob (film, film->playlist(), false)); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); } @@ -169,14 +174,14 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3) film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_name ("frobozz"); - shared_ptr content (new FFmpegContent (film, "test/data/white.wav")); + shared_ptr content (new FFmpegContent("test/data/white.wav")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->set_audio_channels (12); boost::signals2::connection connection; - JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished)); - wait_for_jobs (); + JobManager::instance()->analyse_audio (film, film->playlist(), false, connection, boost::bind (&analysis_finished)); + BOOST_REQUIRE (!wait_for_jobs()); BOOST_CHECK (done); } @@ -187,13 +192,33 @@ 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_factory(film, private_data / "20 The Wedding Convoy Song.m4a").front(); + shared_ptr content = content_factory(TestPaths::private_data / "20 The Wedding Convoy Song.m4a").front(); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); shared_ptr playlist (new Playlist); - playlist->add (content); + playlist->add (film, 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 ()); } + +BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test) +{ + shared_ptr film = new_test_film2 ("analyse_audio_leqm_test"); + film->set_audio_channels (2); + shared_ptr 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 (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); +}