X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=2c34c437d4151b140c26937f11bff43f18ce071e;hp=48422259c7d272c7df160b1b6daa6d5b6bbd5139;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=08d62727f7f1c813cbc7041027fe4a52518623da

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 48422259c..2c34c437d 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -24,7 +24,7 @@
 #include <boost/test/unit_test.hpp>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/sound_mxf.h>
+#include <dcp/sound_asset.h>
 #include <dcp/sound_frame.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel.h>
@@ -44,10 +44,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
 	film->set_name ("ffmpeg_audio_test");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
+	
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
@@ -65,51 +66,51 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 
 	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
-	BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), 6);
+	BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), 6);
 
 	/* Sample index in the DCP */
 	int n = 0;
 	/* DCP sound asset frame */
 	int frame = 0;
 
-	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())) {
 
-			if (sound_asset->mxf()->channels() > 0) {
+			if (sound_asset->asset()->channels() > 0) {
 				/* L should be silent */
 				int const sample = d[i + 0] | (d[i + 1] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
-			if (sound_asset->mxf()->channels() > 1) {
+			if (sound_asset->asset()->channels() > 1) {
 				/* R should be silent */
 				int const sample = d[i + 2] | (d[i + 3] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 			
-			if (sound_asset->mxf()->channels() > 2) {
+			if (sound_asset->asset()->channels() > 2) {
 				/* Mono input so it will appear on centre */
 				int const sample = d[i + 7] | (d[i + 8] << 8);
 				BOOST_CHECK_EQUAL (sample, n);
 			}
 
-			if (sound_asset->mxf()->channels() > 3) {
+			if (sound_asset->asset()->channels() > 3) {
 				/* Lfe should be silent */
 				int const sample = d[i + 9] | (d[i + 10] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
-			if (sound_asset->mxf()->channels() > 4) {
+			if (sound_asset->asset()->channels() > 4) {
 				/* Ls should be silent */
 				int const sample = d[i + 11] | (d[i + 12] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);
 			}
 
 
-			if (sound_asset->mxf()->channels() > 5) {
+			if (sound_asset->asset()->channels() > 5) {
 				/* Rs should be silent */
 				int const sample = d[i + 13] | (d[i + 14] << 8);
 				BOOST_CHECK_EQUAL (sample, 0);