X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Faudio_delay_test.cc;h=f1b804830a4bb78660afbc4a92f1e93be8a11be8;hb=19f94521139aac13ef8fb4eaa55855b2ada307b4;hp=e8112613c8b2f563bd209b91681af2b07741e9c1;hpb=b1f84f5635e4ebbd98882b39e5c5b19f62fe006e;p=dcpomatic.git

diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index e8112613c..f1b804830 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,17 +17,25 @@
 
 */
 
+/** @file  test/audio_delay_test.cc
+ *  @brief Test encode using some SndfileContents which have audio delays.
+ *
+ *  The output is checked algorithmically using knowledge of the input.
+ */
+
 #include <boost/test/unit_test.hpp>
-#include <libdcp/sound_frame.h>
-#include <libdcp/cpl.h>
-#include <libdcp/reel.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/reel_sound_asset.h>
+#include <dcp/sound_frame.h>
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/sound_asset.h>
+#include <dcp/reel_sound_asset.h>
 #include "lib/sndfile_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;
@@ -37,14 +45,16 @@ 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_dci_name ("FTR"));
+	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);
+	content->audio->set_delay (delay_in_ms);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
@@ -67,11 +77,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()->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);
@@ -81,13 +91,12 @@ void test_audio_delay (int delay_in_ms)
 				delayed = 0;
 			}
 
-			BOOST_CHECK_EQUAL (sample, delayed);
+			BOOST_REQUIRE_EQUAL (sample, delayed);
 			++n;
 		}
 	}
 }
 
-
 /* Test audio delay when specified in a piece of audio content */
 BOOST_AUTO_TEST_CASE (audio_delay_test)
 {