Run all tests with lots of encoding threads.

[dcpomatic.git] / test / audio_delay_test.cc

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index f12e8717ea3a87742daf8c87adff1271a0a9536c..8e1d820859fa458838acc144bf6970ed6098331b 100644 (file)
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -1,24 +1,28 @@
 /*
     Copyright (C) 2013-2014 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/>.
 
 */
 
+/** @defgroup specific Tests of fairly specific areas */
+
 /** @file  test/audio_delay_test.cc
- *  @brief Test encode using some SndfileContents which have audio delays.
+ *  @brief Test encode using some FFmpegContents which have audio delays.
+ *  @ingroup specific
  *
  *  The output is checked algorithmically using knowledge of the input.
  */
@@ -28,8 +32,9 @@
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
 #include <dcp/reel_sound_asset.h>
-#include "lib/sndfile_content.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
 #include "lib/film.h"
@@ -53,17 +58,18 @@ void test_audio_delay (int delay_in_ms)
        film->set_container (Ratio::from_id ("185"));
        film->set_name (film_name);
 
-       shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/staircase.wav"));
-       content->audio->set_audio_delay (delay_in_ms);
+       shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
        film->examine_and_add_content (content);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
+       content->audio->set_delay (delay_in_ms);
 
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        boost::filesystem::path path = "build/test";
        path /= film_name;
        path /= film->dcp_name ();
+       std::cout << "Loading " << path.string() << "\n";
        dcp::DCP check (path.string ());
        check.read ();
 
@@ -78,7 +84,7 @@ void test_audio_delay (int delay_in_ms)
        int const delay_in_frames = delay_in_ms * 48000 / 1000;
 
        while (n < sound_asset->asset()->intrinsic_duration()) {
-               shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
+               shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
                uint8_t const * d = sound_frame->data ();
 
                for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {