Fix crash with sub-sample push parts in AudioMerger.

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 8328c7cd25d9cb03b62d84c83589af69de497b79..5d65ab693c5f6cbd7394e123cb0aaf2b9f057637 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -18,8 +18,11 @@
 
 */
 
+/** @defgroup selfcontained Self-contained tests of single classes / method sets */
+
 /** @file  test/audio_analysis_test.cc
- *  @brief Check audio analysis code.
+ *  @brief Test AudioAnalysis class.
+ *  @ingroup selfcontained
  */
 
 #include <boost/test/unit_test.hpp>
@@ -35,9 +38,11 @@
 #include "lib/content_factory.h"
 #include "lib/playlist.h"
 #include "test.h"
+#include <iostream>
 
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static float
 random_float ()
@@ -68,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);
@@ -87,6 +94,9 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
                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
@@ -103,14 +113,14 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
        film->set_name ("audio_analysis_test");
        boost::filesystem::path p = private_data / "betty_L.wav";
 
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, p));
+       shared_ptr<FFmpegContent> c (new FFmpegContent(p));
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> 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 */
@@ -118,16 +128,16 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 {
        shared_ptr<Film> film = new_test_film ("audio_analysis_negative_delay_test");
        film->set_name ("audio_analysis_negative_delay_test");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent(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<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> 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 */
@@ -135,14 +145,14 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
 {
        shared_ptr<Film> film = new_test_film ("audio_analysis_test2");
        film->set_name ("audio_analysis_test2");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "3d_thx_broadway_2010_lossless.m2ts"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent(private_data / "3d_thx_broadway_2010_lossless.m2ts"));
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+       shared_ptr<AnalyseAudioJob> 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());
 }
 
 
@@ -164,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<FFmpegContent> content (new FFmpegContent (film, "test/data/white.wav"));
+       shared_ptr<FFmpegContent> 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);
 }
 
@@ -182,13 +192,13 @@ 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 = content_factory (film, private_data / "20 The Wedding Convoy Song.m4a");
+       shared_ptr<Content> content = content_factory(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> 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 ());
 }