#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"
}
-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.
*/
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);
}
}
+BOOST_AUTO_TEST_CASE(analyse_audio_leqm_same_with_empty_channels)
+{
+ auto dcp = make_shared<DCPContent>(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>();
+ 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_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>();
+ 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());
+}
+