X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=e4472ad4fef042f52f4822e56f5b82b2290a2009;hp=e3b0243e0bbe99b004a54c8a325ec4174ec0e0bd;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=d19b7cbd3d1a428697bc9b26fdc0be36fafa444a

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index e3b0243e0..e4472ad4f 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -17,13 +17,22 @@
 
 */
 
-#include <libdcp/cpl.h>
-#include <libdcp/dcp.h>
-#include <libdcp/sound_asset.h>
-#include <libdcp/reel.h>
-#include "sndfile_content.h"
+#include <boost/test/unit_test.hpp>
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_frame.h>
+#include <dcp/reel.h>
+#include <dcp/reel_sound_asset.h>
+#include "lib/sndfile_content.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ratio.h"
+#include "test.h"
 
+using std::string;
 using boost::lexical_cast;
+using boost::shared_ptr;
 
 static void test_silence_padding (int channels)
 {
@@ -37,19 +46,72 @@ static void test_silence_padding (int channels)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	film->set_dcp_audio_channels (channels);
+	film->set_audio_channels (channels);
 	film->make_dcp ();
 	wait_for_jobs ();
 
 	boost::filesystem::path path = "build/test";
 	path /= film_name;
 	path /= film->dcp_name ();
-	libdcp::DCP check (path.string ());
+	dcp::DCP check (path.string ());
 	check.read ();
 
-	shared_ptr<const libdcp::SoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
-	BOOST_CHECK (sound_asset->channels () == channels);
+	BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), channels);
+
+	/* 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++);
+		uint8_t const * d = sound_frame->data ();
+		
+		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->mxf()->channels())) {
+
+			if (sound_asset->mxf()->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) {
+				/* 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) {
+				/* 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) {
+				/* 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) {
+				/* 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) {
+				/* Rs should be silent */
+				int const sample = d[i + 13] | (d[i + 14] << 8);
+				BOOST_CHECK_EQUAL (sample, 0);
+			}
+
+			++n;
+		}
+	}
+	
 }
 
 BOOST_AUTO_TEST_CASE (silence_padding_test)