X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=c960884a1ef9d6c2b6ae3eacfcf5700090fdd47b;hp=6c05916ab6aa78aef9c9a3fe640ff5e6cf7e8320;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=0f7110dc6a34640a55ba5bdc16dd23f2b9f47d30 diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index 6c05916ab..c960884a1 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -25,11 +26,14 @@ #include "lib/audio_analysis.h" #include "lib/analyse_audio_job.h" #include "lib/film.h" -#include "lib/sndfile_content.h" +#include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" #include "lib/ratio.h" #include "lib/job_manager.h" +#include "lib/audio_content.h" +#include "lib/content_factory.h" +#include "lib/playlist.h" #include "test.h" using boost::shared_ptr; @@ -44,9 +48,9 @@ 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) { @@ -59,7 +63,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test) float const peak = random_float (); DCPTime const peak_time = DCPTime (rand ()); - a.set_peak (peak, peak_time); + a.set_sample_peak (peak, peak_time); a.write ("build/test/audio_analysis_serialisation_test"); @@ -74,11 +78,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test) BOOST_CHECK_CLOSE (p[AudioPoint::RMS], random_float (), 1); } } - - BOOST_CHECK (b.peak ()); - BOOST_CHECK_CLOSE (b.peak().get(), peak, 1); - BOOST_CHECK (b.peak_time ()); - BOOST_CHECK_EQUAL (b.peak_time().get(), peak_time); + + BOOST_CHECK (b.sample_peak ()); + BOOST_CHECK_CLOSE (b.sample_peak().get(), peak, 1); + BOOST_CHECK (b.sample_peak_time ()); + BOOST_CHECK_EQUAL (b.sample_peak_time().get().get(), peak_time.get()); } static void @@ -95,11 +99,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test) film->set_name ("audio_analysis_test"); boost::filesystem::path p = private_data / "betty_L.wav"; - shared_ptr c (new SndfileContent (film, p)); + shared_ptr c (new FFmpegContent (film, p)); film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr job (new AnalyseAudioJob (film)); + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); @@ -110,12 +114,13 @@ 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")); - c->set_audio_delay (-250); + shared_ptr c (new FFmpegContent (film, private_data / "boon_telly.mkv")); film->examine_and_add_content (c); wait_for_jobs (); - - shared_ptr job (new AnalyseAudioJob (film)); + + c->audio->set_delay (-250); + + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); @@ -126,12 +131,60 @@ 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 (film, private_data / "3d_thx_broadway_2010_lossless.m2ts")); film->examine_and_add_content (c); wait_for_jobs (); - - shared_ptr job (new AnalyseAudioJob (film)); + + shared_ptr job (new AnalyseAudioJob (film, film->playlist ())); job->Finished.connect (boost::bind (&finished)); JobManager::instance()->add (job); wait_for_jobs (); } + + +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. + */ +BOOST_AUTO_TEST_CASE (audio_analysis_test3) +{ + shared_ptr film = new_test_film ("analyse_audio_test"); + film->set_container (Ratio::from_id ("185")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); + film->set_name ("frobozz"); + + shared_ptr content (new FFmpegContent (film, "test/data/white.wav")); + film->examine_and_add_content (content); + 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 (); + BOOST_CHECK (done); +} + +/** Run an audio analysis that triggered an exception in the audio decoder at one point */ +BOOST_AUTO_TEST_CASE (analyse_audio_test4) +{ + shared_ptr film = new_test_film ("analyse_audio_test"); + 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"); + film->examine_and_add_content (content); + wait_for_jobs (); + + shared_ptr playlist (new Playlist); + playlist->add (content); + boost::signals2::connection c; + JobManager::instance()->analyse_audio (film, playlist, c, boost::bind (&finished)); + BOOST_CHECK (!wait_for_jobs ()); +}