X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=8bdca4c32877ccb744804f3a274608e611bc4735;hb=303371f38971b4fcca2f6e35c5cf6ef23ac3f4db;hp=e131ce57c9cf331650302488f95d0dcce0adc183;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index e131ce57c..8bdca4c32 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -27,11 +27,11 @@ */ -#include "test.h" #include "lib/analyse_audio_job.h" #include "lib/audio_analysis.h" #include "lib/audio_content.h" #include "lib/content_factory.h" +#include "lib/dcp_content.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" #include "lib/ffmpeg_content.h" @@ -39,12 +39,11 @@ #include "lib/job_manager.h" #include "lib/playlist.h" #include "lib/ratio.h" +#include "test.h" #include -#include using std::make_shared; -using std::shared_ptr; using std::vector; using namespace dcpomatic; @@ -150,15 +149,6 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2) } -static bool done = false; - -static void -analysis_finished () -{ - done = true; -} - - /* Test a case which was reported to throw an exception; analysing * a 12-channel DCP's audio. */ @@ -175,7 +165,8 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3) film->set_audio_channels (12); boost::signals2::connection connection; - JobManager::instance()->analyse_audio(film, film->playlist(), false, connection, boost::bind(&analysis_finished)); + bool done = false; + JobManager::instance()->analyse_audio(film, film->playlist(), false, connection, [&done](Job::Result) { done = true; }); BOOST_REQUIRE (!wait_for_jobs()); BOOST_CHECK (done); } @@ -188,14 +179,14 @@ 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"); - auto content = content_factory(TestPaths::private_data() / "20 The Wedding Convoy Song.m4a").front(); + auto content = content_factory(TestPaths::private_data() / "20 The Wedding Convoy Song.m4a")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); auto playlist = make_shared(); playlist->add (film, content); boost::signals2::connection c; - JobManager::instance()->analyse_audio(film, playlist, false, c, []() {}); + JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {}); BOOST_CHECK (!wait_for_jobs ()); } @@ -204,14 +195,14 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test) { auto film = new_test_film2 ("analyse_audio_leqm_test"); film->set_audio_channels (2); - auto content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav").front(); + auto content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav")[0]; film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); auto playlist = make_shared(); playlist->add (film, content); boost::signals2::connection c; - JobManager::instance()->analyse_audio(film, playlist, false, c, []() {}); + JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {}); BOOST_CHECK (!wait_for_jobs()); AudioAnalysis analysis(film->audio_analysis_path(playlist)); @@ -219,3 +210,76 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test) /* 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); } + + +BOOST_AUTO_TEST_CASE(analyse_audio_leqm_same_with_empty_channels) +{ + auto dcp = make_shared(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"); + auto film = new_test_film2("analyse_audio_leqm_test2", { dcp }); + film->set_audio_channels(8); + + auto analyse = [film, dcp](int channels) { + film->set_audio_channels(channels); + auto playlist = make_shared(); + playlist->add(film, dcp); + boost::signals2::connection c; + JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {}); + BOOST_CHECK(!wait_for_jobs()); + AudioAnalysis analysis(film->audio_analysis_path(playlist)); + return analysis.leqm().get_value_or(0); + }; + + BOOST_CHECK_CLOSE(analyse( 6), 84.51411, 0.001); + BOOST_CHECK_CLOSE(analyse( 8), 84.51411, 0.001); + BOOST_CHECK_CLOSE(analyse(16), 84.51411, 0.001); +} + + +/** Bug #2364; a file with a lot of silent video at the end (about 50s worth) + * crashed the audio analysis with an OOM on Windows. + */ +BOOST_AUTO_TEST_CASE(analyse_audio_with_long_silent_end) +{ + auto content = content_factory(TestPaths::private_data() / "2364.mkv")[0]; + auto film = new_test_film2("analyse_audio_with_long_silent_end", { content }); + + auto playlist = make_shared(); + playlist->add(film, content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {}); + BOOST_CHECK(!wait_for_jobs()); +} + + +BOOST_AUTO_TEST_CASE(analyse_audio_with_strange_channel_count) +{ + auto content = content_factory(TestPaths::private_data() / "mali.mkv")[0]; + auto film = new_test_film2("analyse_audio_with_strange_channel_count", { content }); + + auto playlist = make_shared(); + playlist->add(film, content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio(film, playlist, false, c, [](Job::Result) {}); + BOOST_CHECK(!wait_for_jobs()); +} + + +BOOST_AUTO_TEST_CASE(analyse_audio_with_more_channels_than_film) +{ + auto picture = content_factory("test/data/flat_red.png"); + auto film_16ch = new_test_film2("analyse_audio_with_more_channels_than_film_16ch", picture); + film_16ch->set_audio_channels(16); + make_and_verify_dcp(film_16ch); + + auto pcm_16ch = find_file(film_16ch->dir(film_16ch->dcp_name()), "pcm_"); + auto sound = content_factory(pcm_16ch)[0]; + + auto film_6ch = new_test_film2("analyse_audio_with_more_channels_than_film_6ch", { sound }); + + auto playlist = make_shared(); + playlist->add(film_6ch, sound); + boost::signals2::connection c; + JobManager::instance()->analyse_audio(film_6ch, playlist, false, c, [](Job::Result) {}); + BOOST_CHECK(!wait_for_jobs()); +} +