X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=f1fd40fb791597c4bf5da7e960a05b523b5878cb;hp=cbd12e1ee363cf7d6a592703db2d7984980d2193;hb=dc5e11944a30a9d381dc0e67cf657c5f2cb65845;hpb=28111007e2e6fd62f5810be780706ae1618bd33f

diff --git a/test/test.cc b/test/test.cc
index cbd12e1ee..f1fd40fb7 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,34 +18,39 @@
 
 */
 
+
+
 /** @file  test/test.cc
  *  @brief Overall test stuff and useful methods for tests.
  */
 
+
+#include "lib/compose.hpp"
 #include "lib/config.h"
-#include "lib/util.h"
-#include "lib/signal_manager.h"
-#include "lib/film.h"
-#include "lib/job_manager.h"
-#include "lib/job.h"
 #include "lib/cross.h"
+#include "lib/dcp_content_type.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/encode_server_finder.h"
 #include "lib/ffmpeg_image_proxy.h"
+#include "lib/file_log.h"
+#include "lib/film.h"
 #include "lib/image.h"
-#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
 #include "lib/log_entry.h"
-#include "lib/compose.hpp"
-#include "lib/file_log.h"
-#include "lib/dcpomatic_log.h"
+#include "lib/make_dcp.h"
+#include "lib/ratio.h"
+#include "lib/signal_manager.h"
+#include "lib/util.h"
 #include "test.h"
-#include <dcp/dcp.h>
 #include <dcp/cpl.h>
-#include <dcp/reel.h>
-#include <dcp/reel_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/dcp.h>
 #include <dcp/mono_picture_asset.h>
+#include <dcp/mono_picture_frame.h>
 #include <dcp/openjpeg_image.h>
+#include <dcp/reel.h>
+#include <dcp/reel_picture_asset.h>
+#include <dcp/warnings.h>
 #include <asdcp/AS_DCP.h>
 #include <png.h>
 #include <sndfile.h>
@@ -55,20 +60,25 @@ extern "C" {
 }
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
-#include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
+LIBDCP_DISABLE_WARNINGS
+#include <boost/random.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 #include <list>
 #include <vector>
-#include <iostream>
 
-using std::string;
-using std::vector;
-using std::min;
-using std::cout;
+
+using std::abs;
 using std::cerr;
+using std::cout;
 using std::list;
-using std::abs;
+using std::make_shared;
+using std::min;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::scoped_array;
 using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
@@ -94,13 +104,12 @@ boost::filesystem::path TestPaths::xsd ()
 }
 
 
-void
+static void
 setup_test_config ()
 {
-	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency());
+	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2);
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
-	Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
 	Config::instance()->set_default_container (Ratio::from_id ("185"));
 	Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 	Config::instance()->set_default_audio_delay (0);
@@ -109,18 +118,23 @@ setup_test_config ()
 	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_DISK
+		LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK
 		);
 	Config::instance()->set_automatic_audio_analysis (false);
+	auto signer = make_shared<dcp::CertificateChain>(dcp::file_to_string("test/data/signer_chain"));
+	signer->set_key(dcp::file_to_string("test/data/signer_key"));
+	Config::instance()->set_signer_chain (signer);
+	auto decryption = make_shared<dcp::CertificateChain>(dcp::file_to_string("test/data/decryption_chain"));
+	decryption->set_key(dcp::file_to_string("test/data/decryption_key"));
+	Config::instance()->set_decryption_chain (decryption);
 }
 
+
 class TestSignalManager : public SignalManager
 {
 public:
 	/* No wakes in tests: we call ui_idle ourselves */
-	void wake_ui ()
+	void wake_ui () override
 	{
 
 	}
@@ -149,8 +163,10 @@ struct TestConfig
 	}
 };
 
+
 BOOST_GLOBAL_FIXTURE (TestConfig);
 
+
 boost::filesystem::path
 test_film_dir (string name)
 {
@@ -161,45 +177,57 @@ test_film_dir (string name)
 	return p;
 }
 
+
 shared_ptr<Film>
 new_test_film (string name)
 {
-	boost::filesystem::path p = test_film_dir (name);
+	auto p = test_film_dir (name);
 	if (boost::filesystem::exists (p)) {
 		boost::filesystem::remove_all (p);
 	}
 
-	shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
+	auto film = make_shared<Film>(p);
 	film->write_metadata ();
 	return film;
 }
 
+
 shared_ptr<Film>
-new_test_film2 (string name)
+new_test_film2 (string name, vector<shared_ptr<Content>> content, Cleanup* cleanup)
 {
-	boost::filesystem::path p = test_film_dir (name);
+	auto p = test_film_dir (name);
 	if (boost::filesystem::exists (p)) {
 		boost::filesystem::remove_all (p);
 	}
+	if (cleanup) {
+		cleanup->add (p);
+	}
 
-	shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
+	auto film = make_shared<Film>(p);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_container (Ratio::from_id ("185"));
 	film->write_metadata ();
+
+	for (auto i: content) {
+		film->examine_and_add_content (i);
+		BOOST_REQUIRE (!wait_for_jobs());
+	}
+
 	return film;
 }
 
+
 void
 check_wav_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);
+	auto 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);
+	auto 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);
@@ -232,6 +260,7 @@ check_wav_file (boost::filesystem::path ref, boost::filesystem::path check)
 	}
 }
 
+
 void
 check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
@@ -339,13 +368,15 @@ static
 double
 rms_error (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	FFmpegImageProxy ref_proxy (ref, VIDEO_RANGE_FULL);
-	shared_ptr<Image> ref_image = ref_proxy.image().image;
-	FFmpegImageProxy check_proxy (check, VIDEO_RANGE_FULL);
-	shared_ptr<Image> check_image = check_proxy.image().image;
+	FFmpegImageProxy ref_proxy (ref);
+	auto ref_image = ref_proxy.image(Image::Alignment::COMPACT).image;
+	FFmpegImageProxy check_proxy (check);
+	auto check_image = check_proxy.image(Image::Alignment::COMPACT).image;
+
+	BOOST_REQUIRE_EQUAL (ref_image->planes(), check_image->planes());
 
 	BOOST_REQUIRE_EQUAL (ref_image->pixel_format(), check_image->pixel_format());
-	AVPixelFormat const format = ref_image->pixel_format();
+	auto const format = ref_image->pixel_format();
 
 	BOOST_REQUIRE (ref_image->size() == check_image->size());
 	int const width = ref_image->size().width;
@@ -392,6 +423,19 @@ rms_error (boost::filesystem::path ref, boost::filesystem::path check)
 			}
 			break;
 		}
+		case AV_PIX_FMT_YUVJ420P:
+		{
+			for (int c = 0; c < ref_image->planes(); ++c) {
+				for (int y = 0; y < height / ref_image->vertical_factor(c); ++y) {
+					auto p = ref_image->data()[c] + y * ref_image->stride()[c];
+					auto q = check_image->data()[c] + y * check_image->stride()[c];
+					for (int x = 0; x < ref_image->line_size()[c]; ++x) {
+						sum_square += pow((*p++ - *q++), 2);
+					}
+				}
+			}
+			break;
+		}
 		default:
 			BOOST_REQUIRE_MESSAGE (false, "unrecognised pixel format " << format);
 	}
@@ -420,41 +464,62 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check, double
 void
 check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	uintmax_t N = boost::filesystem::file_size (ref);
+	auto N = boost::filesystem::file_size (ref);
 	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
-	FILE* ref_file = fopen_boost (ref, "rb");
+	dcp::File ref_file(ref, "rb");
 	BOOST_CHECK (ref_file);
-	FILE* check_file = fopen_boost (check, "rb");
+	dcp::File check_file(check, "rb");
 	BOOST_CHECK (check_file);
 
 	int const buffer_size = 65536;
-	uint8_t* ref_buffer = new uint8_t[buffer_size];
-	uint8_t* check_buffer = new uint8_t[buffer_size];
+	std::vector<uint8_t> ref_buffer(buffer_size);
+	std::vector<uint8_t> check_buffer(buffer_size);
 
 	string 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);
+		size_t r = ref_file.read (ref_buffer.data(), 1, this_time);
 		BOOST_CHECK_EQUAL (r, this_time);
-		r = fread (check_buffer, 1, this_time, check_file);
+		r = check_file.read(check_buffer.data(), 1, this_time);
 		BOOST_CHECK_EQUAL (r, this_time);
 
-		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
-		if (memcmp (ref_buffer, check_buffer, this_time)) {
+		BOOST_CHECK_MESSAGE (memcmp (ref_buffer.data(), check_buffer.data(), this_time) == 0, error);
+		if (memcmp (ref_buffer.data(), check_buffer.data(), this_time)) {
 			break;
 		}
 
 		N -= this_time;
 	}
+}
 
-	delete[] ref_buffer;
-	delete[] check_buffer;
 
-	fclose (ref_file);
-	fclose (check_file);
+void
+check_text_file (boost::filesystem::path ref, boost::filesystem::path check)
+{
+	dcp::File ref_file(ref, "r");
+	BOOST_CHECK (ref_file);
+	dcp::File check_file(check, "r");
+	BOOST_CHECK (check_file);
+
+	int const buffer_size = std::max(
+		boost::filesystem::file_size(ref),
+		boost::filesystem::file_size(check)
+		);
+
+	DCPOMATIC_ASSERT (buffer_size < 1024 * 1024);
+
+	std::vector<uint8_t> ref_buffer(buffer_size);
+	auto ref_read = ref_file.read(ref_buffer.data(), 1, buffer_size);
+	std::vector<uint8_t> check_buffer(buffer_size);
+	auto check_read = check_file.read(check_buffer.data(), 1, buffer_size);
+	BOOST_CHECK_EQUAL (ref_read, check_read);
+
+	string const error = "File " + check.string() + " differs from reference " + ref.string();
+	BOOST_CHECK_MESSAGE(memcmp(ref_buffer.data(), check_buffer.data(), ref_read) == 0, error);
 }
 
+
 static void
 note (dcp::NoteType t, string n)
 {
@@ -501,28 +566,28 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 		return;
 	}
 
-	xmlpp::Element::NodeList ref_children = ref->get_children ();
-	xmlpp::Element::NodeList test_children = test->get_children ();
+	auto ref_children = ref->get_children ();
+	auto test_children = test->get_children ();
 	BOOST_REQUIRE_MESSAGE (
 		ref_children.size() == test_children.size(),
 		ref->get_name() << " has " << ref_children.size() << " or " << test_children.size() << " children"
 		);
 
-	xmlpp::Element::NodeList::iterator k = ref_children.begin ();
-	xmlpp::Element::NodeList::iterator l = test_children.begin ();
+	auto k = ref_children.begin ();
+	auto l = test_children.begin ();
 	while (k != ref_children.end ()) {
 
 		/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
-		xmlpp::Element* ref_el = dynamic_cast<xmlpp::Element*> (*k);
-		xmlpp::Element* test_el = dynamic_cast<xmlpp::Element*> (*l);
+		auto ref_el = dynamic_cast<xmlpp::Element*>(*k);
+		auto test_el = dynamic_cast<xmlpp::Element*>(*l);
 		BOOST_CHECK ((ref_el && test_el) || (!ref_el && !test_el));
 		if (ref_el && test_el) {
 			check_xml (ref_el, test_el, ignore);
 		}
 
-		xmlpp::ContentNode* ref_cn = dynamic_cast<xmlpp::ContentNode*> (*k);
-		xmlpp::ContentNode* test_cn = dynamic_cast<xmlpp::ContentNode*> (*l);
+		auto ref_cn = dynamic_cast<xmlpp::ContentNode*>(*k);
+		auto test_cn = dynamic_cast<xmlpp::ContentNode*>(*l);
 		BOOST_CHECK ((ref_cn && test_cn) || (!ref_cn && !test_cn));
 		if (ref_cn && test_cn) {
 			BOOST_CHECK_EQUAL (ref_cn->get_content(), test_cn->get_content ());
@@ -532,12 +597,12 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 		++l;
 	}
 
-	xmlpp::Element::AttributeList ref_attributes = ref->get_attributes ();
-	xmlpp::Element::AttributeList test_attributes = test->get_attributes ();
+	auto ref_attributes = ref->get_attributes ();
+	auto test_attributes = test->get_attributes ();
 	BOOST_CHECK_EQUAL (ref_attributes.size(), test_attributes.size ());
 
-	xmlpp::Element::AttributeList::const_iterator m = ref_attributes.begin();
-	xmlpp::Element::AttributeList::const_iterator n = test_attributes.begin();
+	auto m = ref_attributes.begin();
+	auto n = test_attributes.begin();
 	while (m != ref_attributes.end ()) {
 		BOOST_CHECK_EQUAL ((*m)->get_name(), (*n)->get_name());
 		BOOST_CHECK_EQUAL ((*m)->get_value(), (*n)->get_value());
@@ -550,10 +615,10 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 void
 check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<string> ignore)
 {
-	xmlpp::DomParser* ref_parser = new xmlpp::DomParser (ref.string ());
-	xmlpp::Element* ref_root = ref_parser->get_document()->get_root_node ();
-	xmlpp::DomParser* test_parser = new xmlpp::DomParser (test.string ());
-	xmlpp::Element* test_root = test_parser->get_document()->get_root_node ();
+	auto ref_parser = new xmlpp::DomParser(ref.string());
+	auto ref_root = ref_parser->get_document()->get_root_node();
+	auto test_parser = new xmlpp::DomParser(test.string());
+	auto test_root = test_parser->get_document()->get_root_node();
 
 	check_xml (ref_root, test_root, ignore);
 }
@@ -561,26 +626,26 @@ check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
 bool
 wait_for_jobs ()
 {
-	JobManager* jm = JobManager::instance ();
-	while (jm->work_to_do ()) {
-		while (signal_manager->ui_idle ()) {}
+	auto jm = JobManager::instance ();
+	while (jm->work_to_do()) {
+		while (signal_manager->ui_idle()) {}
 		dcpomatic_sleep_seconds (1);
 	}
 
 	if (jm->errors ()) {
 		int N = 0;
-		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
-			if ((*i)->finished_in_error ()) {
+		for (auto i: jm->_jobs) {
+			if (i->finished_in_error()) {
 				++N;
 			}
 		}
 		cerr << N << " errors.\n";
 
-		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
-			if ((*i)->finished_in_error ()) {
-				cerr << (*i)->name() << ":\n"
-				     << "\tsummary: " << (*i)->error_summary () << "\n"
-				     << "\tdetails: " << (*i)->error_details () << "\n";
+		for (auto i: jm->_jobs) {
+			if (i->finished_in_error()) {
+				cerr << i->name() << ":\n"
+				     << "\tsummary: " << i->error_summary() << "\n"
+				     << "\tdetails: " << i->error_details() << "\n";
 			}
 		}
 	}
@@ -599,25 +664,25 @@ wait_for_jobs ()
 class Memory
 {
 public:
-	Memory ()
-		: data(0)
-		, size(0)
-	{}
+	Memory () {}
 
 	~Memory ()
 	{
 		free (data);
 	}
 
-	uint8_t* data;
-	size_t size;
+	Memory (Memory const&) = delete;
+	Memory& operator= (Memory const&) = delete;
+
+	uint8_t* data = nullptr;
+	size_t size = 0;
 };
 
 
 static void
 png_write_data (png_structp png_ptr, png_bytep data, png_size_t length)
 {
-	Memory* mem = reinterpret_cast<Memory*>(png_get_io_ptr(png_ptr));
+	auto mem = reinterpret_cast<Memory*>(png_get_io_ptr(png_ptr));
 	size_t size = mem->size + length;
 
 	if (mem->data) {
@@ -641,24 +706,22 @@ png_flush (png_structp)
 
 
 static void
-png_error_fn (png_structp png_ptr, char const * message)
+png_error_fn (png_structp, char const * message)
 {
-	reinterpret_cast<Image*>(png_get_error_ptr(png_ptr))->png_error (message);
+	throw EncodeError (String::compose("Error during PNG write: %1", message));
 }
 
 
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 {
-	int png_color_type = 0;
+	int png_color_type = PNG_COLOR_TYPE_RGB;
 	int bits_per_pixel = 0;
 	switch (image->pixel_format()) {
 	case AV_PIX_FMT_RGB24:
-		png_color_type = PNG_COLOR_TYPE_RGB;
 		bits_per_pixel = 8;
 		break;
 	case AV_PIX_FMT_XYZ12LE:
-		png_color_type = PNG_COLOR_TYPE_RGB;
 		bits_per_pixel = 16;
 		break;
 	default:
@@ -678,9 +741,40 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 
 	png_set_IHDR (png_ptr, info_ptr, image->size().width, image->size().height, bits_per_pixel, png_color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
-	png_byte ** row_pointers = reinterpret_cast<png_byte **>(png_malloc(png_ptr, image->size().height * sizeof(png_byte *)));
-	for (int i = 0; i < image->size().height; ++i) {
-		row_pointers[i] = (png_byte *) (image->data()[0] + i * image->stride()[0]);
+	auto const width = image->size().width;
+	auto const height = image->size().height;
+	auto const stride = image->stride()[0];
+
+	vector<vector<uint8_t>> data_to_write(height);
+	for (int y = 0; y < height; ++y) {
+		data_to_write[y].resize(stride);
+	}
+
+	switch (image->pixel_format()) {
+	case AV_PIX_FMT_RGB24:
+		for (int y = 0; y < height; ++y) {
+			memcpy(data_to_write[y].data(), image->data()[0] + y * stride, stride);
+		}
+		break;
+	case AV_PIX_FMT_XYZ12LE:
+		/* 16-bit pixel values must be written MSB first */
+		for (int y = 0; y < height; ++y) {
+			data_to_write[y].resize(stride);
+			uint8_t* original = image->data()[0] + y * stride;
+			for (int x = 0; x < width * 3; ++x) {
+				data_to_write[y][x * 2] = original[1];
+				data_to_write[y][x * 2 + 1] = original[0];
+				original += 2;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	png_byte ** row_pointers = reinterpret_cast<png_byte**>(png_malloc(png_ptr, image->size().height * sizeof(png_byte *)));
+	for (int y = 0; y < height; ++y) {
+		row_pointers[y] = reinterpret_cast<png_byte*>(data_to_write[y].data());
 	}
 
 	png_write_info (png_ptr, info_ptr);
@@ -706,13 +800,13 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 {
 	dcp::DCP dcp (dcp_dir);
 	dcp.read ();
-	shared_ptr<dcp::MonoPictureAsset> asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
+	auto asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
 	BOOST_REQUIRE (asset);
-	shared_ptr<const dcp::MonoPictureFrame> frame = asset->start_read()->get_frame(index);
-	shared_ptr<const dcp::MonoPictureFrame> ref_frame (new dcp::MonoPictureFrame (ref));
+	auto frame = asset->start_read()->get_frame(index);
+	auto ref_frame (new dcp::MonoPictureFrame (ref));
 
-	shared_ptr<dcp::OpenJPEGImage> image = frame->xyz_image ();
-	shared_ptr<dcp::OpenJPEGImage> ref_image = ref_frame->xyz_image ();
+	auto image = frame->xyz_image ();
+	auto ref_image = ref_frame->xyz_image ();
 
 	BOOST_REQUIRE (image->size() == ref_image->size());
 
@@ -730,33 +824,21 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 boost::filesystem::path
 dcp_file (shared_ptr<const Film> film, string prefix)
 {
-	boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->dir(film->dcp_name()));
-	while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), prefix)) {
+	auto i = boost::filesystem::recursive_directory_iterator(film->dir(film->dcp_name()));
+	while (i != boost::filesystem::recursive_directory_iterator() && !boost::algorithm::starts_with(i->path().leaf().string(), prefix)) {
 		++i;
 	}
 
-	BOOST_REQUIRE (i != boost::filesystem::directory_iterator());
+	BOOST_REQUIRE_MESSAGE(i != boost::filesystem::recursive_directory_iterator(), "Could not find file with prefix " << prefix);
 	return i->path();
 }
 
 boost::filesystem::path
 subtitle_file (shared_ptr<Film> film)
 {
-	for (
-		boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false));
-		i != boost::filesystem::directory_iterator ();
-		++i) {
-
-		if (boost::filesystem::is_directory (i->path ())) {
-			for (
-				boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
-				j != boost::filesystem::directory_iterator ();
-				++j) {
-
-				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
-					return j->path();
-				}
-			}
+	for (auto i: boost::filesystem::recursive_directory_iterator(film->directory().get() / film->dcp_name(false))) {
+		if (boost::algorithm::starts_with(i.path().leaf().string(), "sub_")) {
+			return i.path();
 		}
 	}
 
@@ -765,16 +847,22 @@ subtitle_file (shared_ptr<Film> film)
 	return boost::filesystem::path("/");
 }
 
+
 void
 make_random_file (boost::filesystem::path path, size_t size)
 {
-	FILE* t = fopen_boost(path, "wb");
-	BOOST_REQUIRE (t);
-	for (size_t i = 0; i < size; ++i) {
-		uint8_t r = rand() & 0xff;
-		fwrite (&r, 1, 1, t);
+	dcp::File random_file(path, "wb");
+	BOOST_REQUIRE (random_file);
+
+	boost::random::mt19937 rng(1);
+	boost::random::uniform_int_distribution<uint64_t> dist(0);
+
+	while (size > 0) {
+		auto this_time = std::min(size, size_t(8));
+		uint64_t random = dist(rng);
+		random_file.write(&random, this_time, 1);
+		size -= this_time;
 	}
-	fclose (t);
 }
 
 
@@ -798,7 +886,7 @@ dcp::operator<< (std::ostream& s, dcp::Size i)
 }
 
 std::ostream&
-dcp::operator<< (std::ostream& s, Standard t)
+dcp::operator<< (std::ostream& s, dcp::Standard t)
 {
 	switch (t) {
 	case Standard::INTEROP:
@@ -811,3 +899,84 @@ dcp::operator<< (std::ostream& s, Standard t)
 	return s;
 }
 
+std::ostream&
+operator<< (std::ostream&s, VideoFrameType f)
+{
+	s << video_frame_type_to_string(f);
+	return s;
+}
+
+
+void
+Cleanup::add (boost::filesystem::path path)
+{
+	_paths.push_back (path);
+}
+
+
+void
+Cleanup::run ()
+{
+	boost::system::error_code ec;
+	for (auto i: _paths) {
+		boost::filesystem::remove_all (i, ec);
+	}
+}
+
+
+void stage (string, boost::optional<boost::filesystem::path>) {}
+void progress (float) {}
+
+
+void
+make_and_verify_dcp (shared_ptr<Film> film, vector<dcp::VerificationNote::Code> ignore)
+{
+	film->write_metadata ();
+	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
+	BOOST_REQUIRE (!wait_for_jobs());
+	auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd());
+	bool ok = true;
+	for (auto i: notes) {
+		if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) {
+			std::cout << "\t" << dcp::note_to_string(i) << "\n";
+			ok = false;
+		}
+	}
+	BOOST_CHECK(ok);
+}
+
+
+void
+check_int_close (int a, int b, int d)
+{
+	BOOST_CHECK_MESSAGE (std::abs(a - b) < d, a << " differs from " << b << " by more than " << d);
+}
+
+
+void
+check_int_close (std::pair<int, int> a, std::pair<int, int> b, int d)
+{
+	check_int_close (a.first, b.first, d);
+	check_int_close (a.second, b.second, d);
+}
+
+
+ConfigRestorer::~ConfigRestorer()
+{
+	setup_test_config();
+}
+
+
+boost::filesystem::path
+find_file (boost::filesystem::path dir, string filename_part)
+{
+	boost::optional<boost::filesystem::path> found;
+	for (auto i: boost::filesystem::directory_iterator(dir)) {
+		if (i.path().filename().string().find(filename_part) != string::npos) {
+			BOOST_REQUIRE (!found);
+			found = i;
+		}
+	}
+	BOOST_REQUIRE (found);
+	return *found;
+}