X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=6af6409ce5d915588d71bffc40cd05e2ab9ecd56;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=a576ee0c01219ce7950c90922d8e52103508602c;hpb=5d937606cf96d163be98920fa5619114a28eec9d;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index a576ee0c0..6af6409ce 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -68,9 +68,12 @@ using std::cout;
 using std::cerr;
 using std::list;
 using std::abs;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 boost::filesystem::path
@@ -105,7 +108,10 @@ setup_test_config ()
 	Config::instance()->set_default_interop (false);
 	Config::instance()->set_default_still_length (10);
 	Config::instance()->set_log_types (
-		LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREED | LogEntry::TYPE_DEBUG_ENCODE | LogEntry::TYPE_DEBUG_PLAYER
+		LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |
+		LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREED |
+		LogEntry::TYPE_DEBUG_ENCODE | LogEntry::TYPE_DEBUG_PLAYER |
+		LogEntry::TYPE_DISK
 		);
 	Config::instance()->set_automatic_audio_analysis (false);
 }
@@ -333,9 +339,9 @@ static
 double
 rms_error (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	FFmpegImageProxy ref_proxy (ref);
+	FFmpegImageProxy ref_proxy (ref, VideoRange::FULL);
 	shared_ptr<Image> ref_image = ref_proxy.image().image;
-	FFmpegImageProxy check_proxy (check);
+	FFmpegImageProxy check_proxy (check, VideoRange::FULL);
 	shared_ptr<Image> check_image = check_proxy.image().image;
 
 	BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format());
@@ -452,7 +458,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-	if (t == dcp::DCP_ERROR) {
+	if (t == dcp::NoteType::ERROR) {
 		cerr << n << "\n";
 	}
 }
@@ -684,7 +690,7 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 	png_destroy_write_struct (&png_ptr, &info_ptr);
 	png_free (png_ptr, row_pointers);
 
-	dcp::Data(state.data, state.size).write(file);
+	dcp::ArrayData(state.data, state.size).write(file);
 }
 
 
@@ -762,24 +768,13 @@ subtitle_file (shared_ptr<Film> film)
 void
 make_random_file (boost::filesystem::path path, size_t size)
 {
-	size_t const chunk = 128 * 1024;
-	uint8_t* buffer = static_cast<uint8_t*> (malloc(chunk));
-	BOOST_REQUIRE (buffer);
-	FILE* r = fopen("/dev/urandom", "rb");
-	BOOST_REQUIRE (r);
 	FILE* t = fopen_boost(path, "wb");
 	BOOST_REQUIRE (t);
-	while (size) {
-		size_t this_time = min (size, chunk);
-		size_t N = fread (buffer, 1, this_time, r);
-		BOOST_REQUIRE (N == this_time);
-		N = fwrite (buffer, 1, this_time, t);
-		BOOST_REQUIRE (N == this_time);
-		size -= this_time;
+	for (size_t i = 0; i < size; ++i) {
+		uint8_t r = rand() & 0xff;
+		fwrite (&r, 1, 1, t);
 	}
 	fclose (t);
-	fclose (r);
-	free (buffer);
 }
 
 
@@ -795,3 +790,24 @@ LogSwitcher::~LogSwitcher ()
 	dcpomatic_log = _old;
 }
 
+std::ostream&
+dcp::operator<< (std::ostream& s, dcp::Size i)
+{
+	s << i.width << "x" << i.height;
+	return s;
+}
+
+std::ostream&
+dcp::operator<< (std::ostream& s, Standard t)
+{
+	switch (t) {
+	case Standard::INTEROP:
+		s << "interop";
+		break;
+	case Standard::SMPTE:
+		s << "smpte";
+		break;
+	}
+	return s;
+}
+