X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=67d6f2bd2f40b21c8f5c859c69cb9450696edc16;hb=2d3092216e97c02bf715a3df19725518312a0b65;hp=c233a661ddf4666cb65bd89c68a413d44950fcdb;hpb=2cdecbe2b56233b009f6edfa13033c6ec9d198bf;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index c233a661d..67d6f2bd2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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,6 +24,7 @@
 #include <vector>
 #include <list>
 #include <Magick++.h>
+#include <sndfile.h>
 #include <libxml++/libxml++.h>
 #include <dcp/dcp.h>
 #include "lib/config.h"
@@ -46,6 +47,7 @@ using std::cout;
 using std::cerr;
 using std::list;
 using boost::shared_ptr;
+using boost::scoped_array;
 
 boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
@@ -71,6 +73,7 @@ struct TestConfig
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 		Config::instance()->set_default_audio_delay (0);
+		Config::instance()->set_default_j2k_bandwidth (100000000);
 
 		ServerFinder::instance()->disable ();
 
@@ -108,12 +111,51 @@ new_test_film (string name)
 	return f;
 }
 
+void
+check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
+{
+	SF_INFO ref_info;
+	ref_info.format = 0;
+	SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
+	BOOST_CHECK (ref_file);
+	
+	SF_INFO check_info;
+	check_info.format = 0;
+	SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
+	BOOST_CHECK (check_file);
+
+	BOOST_CHECK_EQUAL (ref_info.frames, check_info.frames);
+	BOOST_CHECK_EQUAL (ref_info.samplerate, check_info.samplerate);
+	BOOST_CHECK_EQUAL (ref_info.channels, check_info.channels);
+	BOOST_CHECK_EQUAL (ref_info.format, check_info.format);
+
+	/* buffer_size is in frames */
+	sf_count_t const buffer_size = 65536 * ref_info.channels;
+	scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
+	scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
+	
+	sf_count_t N = ref_info.frames;
+	while (N) {
+		sf_count_t this_time = min (buffer_size, N);
+		sf_count_t r = sf_readf_int (ref_file, ref_buffer.get(), this_time);
+		BOOST_CHECK_EQUAL (r, this_time);
+		r = sf_readf_int (check_file, check_buffer.get(), this_time);
+		BOOST_CHECK_EQUAL (r, this_time);
+
+		for (sf_count_t i = 0; i < this_time; ++i) {
+			BOOST_CHECK (fabs (ref_buffer[i] - check_buffer[i]) <= 65536);
+		}
+
+		N -= this_time;
+	}
+}
+
 void
 check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
 	uintmax_t N = boost::filesystem::file_size (ref);
 	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
-	FILE* ref_file = fopen (ref.c_str(), "rb");
+	FILE* ref_file = fopen_boost (ref, "rb");
 	BOOST_CHECK (ref_file);
 	FILE* check_file = fopen_boost (check, "rb");
 	BOOST_CHECK (check_file);
@@ -122,6 +164,9 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	uint8_t* ref_buffer = new uint8_t[buffer_size];
 	uint8_t* check_buffer = new uint8_t[buffer_size];
 
+	SafeStringStream error;
+	error << "File " << check.string() << " differs from reference " << ref.string();
+	
 	while (N) {
 		uintmax_t this_time = min (uintmax_t (buffer_size), N);
 		size_t r = fread (ref_buffer, 1, this_time, ref_file);
@@ -129,7 +174,11 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 		r = fread (check_buffer, 1, this_time, check_file);
 		BOOST_CHECK_EQUAL (r, this_time);
 
-		BOOST_CHECK_EQUAL (memcmp (ref_buffer, check_buffer, this_time), 0);
+		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+		if (memcmp (ref_buffer, check_buffer, this_time)) {
+			break;
+		}
+		
 		N -= this_time;
 	}
 
@@ -161,7 +210,8 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 	options.max_std_dev_pixel_error = 5;
 	options.max_audio_sample_error = 255;
 	options.cpl_annotation_texts_can_differ = true;
-	options.mxf_names_can_differ = true;
+	options.mxf_filenames_can_differ = true;
+	options.reel_hashes_can_differ = true;
 	
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
@@ -182,7 +232,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
 	xmlpp::Element::NodeList::iterator k = ref_children.begin ();
 	xmlpp::Element::NodeList::iterator l = test_children.begin ();
-	while (k != ref_children.end ()) {
+	while (k != ref_children.end () && l != test_children.end ()) {
 		
 		/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
@@ -211,6 +261,9 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 		++k;
 		++l;
 	}
+
+	BOOST_CHECK (k == ref_children.end ());
+	BOOST_CHECK (l == test_children.end ());
 }
 
 void
@@ -257,7 +310,11 @@ wait_for_jobs ()
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 {
-	using namespace MagickCore;
+#ifdef DCPOMATIC_IMAGE_MAGICK
+		using namespace MagickCore;
+#else
+		using namespace MagickLib;
+#endif		
 
 	Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
 	m.write (file.string ());