X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_delay_test.cc;h=8e1d820859fa458838acc144bf6970ed6098331b;hp=68e14ff3ca353f470d9f09f8c14112f6713b34a4;hb=8fcd1dc3bdec69d4aa7bc76926993733952a10be;hpb=1f82930e73679d6aec5223caa255f564339a1a2a

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index 68e14ff3c..8e1d82085 100644
--- 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.
  */
@@ -27,13 +31,16 @@
 #include <dcp/sound_frame.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/sound_mxf.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"
+#include "lib/audio_content.h"
 #include "test.h"
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -43,23 +50,26 @@ using boost::shared_ptr;
 static
 void test_audio_delay (int delay_in_ms)
 {
+	BOOST_TEST_MESSAGE ("Testing delay of " << delay_in_ms);
+
 	string const film_name = "audio_delay_test_" + lexical_cast<string> (delay_in_ms);
 	shared_ptr<Film> film = new_test_film (film_name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
-	shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/staircase.wav"));
-	content->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 ();
 
@@ -73,11 +83,11 @@ void test_audio_delay (int delay_in_ms)
 	/* Delay in frames */
 	int const delay_in_frames = delay_in_ms * 48000 / 1000;
 
-	while (n < sound_asset->mxf()->intrinsic_duration()) {
-		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->mxf()->get_frame (frame++);
+	while (n < sound_asset->asset()->intrinsic_duration()) {
+		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->mxf()->channels())) {
+
+		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
 
 			/* Mono input so it will appear on centre */
 			int const sample = d[i + 7] | (d[i + 8] << 8);
@@ -87,7 +97,7 @@ void test_audio_delay (int delay_in_ms)
 				delayed = 0;
 			}
 
-			BOOST_CHECK_EQUAL (sample, delayed);
+			BOOST_REQUIRE_EQUAL (sample, delayed);
 			++n;
 		}
 	}