Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

[dcpomatic.git] / test / audio_analysis_test.cc

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 66c5775791ce72c1775ed1511a0feec5a70ca417..a49987125e2eed6d7b3943c1e4829140c8273d6a 100644 (file)
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -38,6 +38,7 @@
 #include "lib/content_factory.h"
 #include "lib/playlist.h"
 #include "test.h"
+#include <iostream>
 
 using std::vector;
 using boost::shared_ptr;
@@ -71,6 +72,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);
@@ -90,6 +93,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
@@ -110,7 +116,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
        film->examine_and_add_content (c);
        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 ();
@@ -127,7 +133,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 
        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 ();
@@ -142,7 +148,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
        film->examine_and_add_content (c);
        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 ();
@@ -173,7 +179,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 
        film->set_audio_channels (12);
        boost::signals2::connection connection;
-       JobManager::instance()->analyse_audio (film, film->playlist(), connection, boost::bind (&analysis_finished));
+       JobManager::instance()->analyse_audio (film, film->playlist(), false, connection, boost::bind (&analysis_finished));
        wait_for_jobs ();
        BOOST_CHECK (done);
 }
@@ -192,6 +198,6 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
        shared_ptr<Playlist> playlist (new Playlist);
        playlist->add (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 ());
 }