X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=8328c7cd25d9cb03b62d84c83589af69de497b79;hb=e362d542009ffeadb4fc892bea605d03d9802bdf;hp=4069471db4018736f5d8ecbabcd7c1934def9d60;hpb=a07e95a72beb7120e7ae4c9b5c7bbba0ffb0bddf;p=dcpomatic.git

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 4069471db..8328c7cd2 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,14 +26,17 @@
 #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 std::vector;
 using boost::shared_ptr;
 
 static float
@@ -58,9 +62,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 		}
 	}
 
-	float const peak = random_float ();
-	DCPTime const peak_time = DCPTime (rand ());
-	a.set_sample_peak (peak, peak_time);
+	vector<AudioAnalysis::PeakTime> peak;
+	for (int i = 0; i < channels; ++i) {
+		peak.push_back (AudioAnalysis::PeakTime (random_float(), DCPTime (rand())));
+	}
+	a.set_sample_peak (peak);
 
 	a.write ("build/test/audio_analysis_serialisation_test");
 
@@ -76,10 +82,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 		}
 	}
 
-	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(), peak_time);
+	BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3);
+	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());
+	}
 }
 
 static void
@@ -96,7 +103,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 	film->set_name ("audio_analysis_test");
 	boost::filesystem::path p = private_data / "betty_L.wav";
 
-	shared_ptr<SndfileContent> c (new SndfileContent (film, p));
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, p));
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
@@ -157,7 +164,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 
-	shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/white.wav"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/white.wav"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -167,3 +174,21 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 	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> 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 = content_factory (film, private_data / "20 The Wedding Convoy Song.m4a");
+	film->examine_and_add_content (content);
+	wait_for_jobs ();
+
+	shared_ptr<Playlist> 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 ());
+}