X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=e94a4541336be02de12dccf528f748ee3de645d4;hp=a761eb520c2b79352b21c836809c4d61c088d633;hb=73a0bf21c7cc460549b6faedc0413d4eab735621;hpb=ddeecdac0600a3fe72660fb1e14b652c59f09d33

diff --git a/test/test.cc b/test/test.cc
index a761eb520..e94a45413 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -110,7 +110,6 @@ setup_test_config ()
 	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_container (Ratio::from_id ("185"));
 	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);
@@ -283,7 +282,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 	for (size_t i = 0; i < ref_desc.ContainerDuration; ++i) {
 		ref_reader.ReadFrame (i, ref_buffer, 0);
 		check_reader.ReadFrame (i, check_buffer, 0);
-		BOOST_REQUIRE (memcmp(ref_buffer.RoData(), check_buffer.RoData(), ref_buffer.Size()) == 0);
+		BOOST_REQUIRE_MESSAGE(memcmp(ref_buffer.RoData(), check_buffer.RoData(), ref_buffer.Size()) == 0, "Audio MXF differs in frame " << i);
 	}
 }
 
@@ -552,6 +551,7 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 	options.reel_annotation_texts_can_differ = true;
 	options.reel_hashes_can_differ = true;
 	options.issue_dates_can_differ = true;
+	options.max_subtitle_vertical_position_error = 0.001;
 
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
@@ -741,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);
@@ -793,25 +824,23 @@ 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)
 {
-	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;
-	}
+	using namespace boost::filesystem;
 
-	BOOST_REQUIRE_MESSAGE(i != boost::filesystem::recursive_directory_iterator(), "Could not find file with prefix " << prefix);
-	return i->path();
+	vector<directory_entry> matches;
+	std::copy_if(directory_iterator(film->dir(film->dcp_name())), directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) {
+		return boost::algorithm::starts_with(entry.path().leaf().string(), prefix);
+	});
+
+	BOOST_REQUIRE_MESSAGE(matches.size() == 1, "Found " << matches.size() << " files with prefix " << prefix);
+	return matches[0].path();
 }
 
 boost::filesystem::path
 subtitle_file (shared_ptr<Film> film)
 {
-	for (auto i: boost::filesystem::directory_iterator(film->directory().get() / film->dcp_name (false))) {
-		if (boost::filesystem::is_directory(i.path())) {
-			for (auto j: boost::filesystem::directory_iterator(i.path())) {
-				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();
 		}
 	}
 
@@ -953,3 +982,27 @@ find_file (boost::filesystem::path dir, string filename_part)
 	BOOST_REQUIRE (found);
 	return *found;
 }
+
+
+Editor::Editor(boost::filesystem::path path)
+	: _path(path)
+	, _content(dcp::file_to_string(path))
+{
+
+}
+
+Editor::~Editor()
+{
+	auto f = fopen(_path.string().c_str(), "w");
+	BOOST_REQUIRE(f);
+	fwrite(_content.c_str(), _content.length(), 1, f);
+	fclose(f);
+}
+
+void
+Editor::replace(string a, string b)
+{
+	auto old_content = _content;
+	boost::algorithm::replace_all(_content, a, b);
+	BOOST_REQUIRE(_content != old_content);
+}