X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=32d32f98879f8ddefcf16f7d19447085d5d873a6;hb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;hp=b111a3b6b85a62dfe591e81aac2c78c2aae822b1;hpb=ffe35585f08d0a5aeccf3e32f9c4cd2a5a6f43f5;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index b111a3b6b..32d32f988 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -71,13 +71,13 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
-boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+boost::filesystem::path TestPaths::TestPaths::private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
 boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
 
 void
 setup_test_config ()
 {
-	Config::instance()->set_master_encoding_threads (1);
+	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency());
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
 	Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
@@ -87,7 +87,9 @@ setup_test_config ()
 	Config::instance()->set_default_j2k_bandwidth (100000000);
 	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);
+	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
+		);
 	Config::instance()->set_automatic_audio_analysis (false);
 }
 
@@ -114,7 +116,7 @@ struct TestConfig
 
 		char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
 		if (env_private) {
-			private_data = env_private;
+			TestPaths::TestPaths::private_data = env_private;
 		}
 
 		dcpomatic_log.reset (new FileLog("build/test/log"));
@@ -235,6 +237,83 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 	}
 }
 
+
+/** @return true if the files are the same, otherwise false */
+bool
+mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose)
+{
+	ASDCP::ATMOS::MXFReader ref_reader;
+	BOOST_REQUIRE (!ASDCP_FAILURE(ref_reader.OpenRead(ref.string().c_str())));
+
+	ASDCP::ATMOS::AtmosDescriptor ref_desc;
+	BOOST_REQUIRE (!ASDCP_FAILURE(ref_reader.FillAtmosDescriptor(ref_desc)));
+
+	ASDCP::ATMOS::MXFReader check_reader;
+	BOOST_REQUIRE (!ASDCP_FAILURE(check_reader.OpenRead(check.string().c_str())));
+
+	ASDCP::ATMOS::AtmosDescriptor check_desc;
+	BOOST_REQUIRE (!ASDCP_FAILURE(check_reader.FillAtmosDescriptor(check_desc)));
+
+	if (ref_desc.EditRate.Numerator != check_desc.EditRate.Numerator) {
+		if (verbose) {
+			std::cout << "EditRate.Numerator differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.EditRate.Denominator != check_desc.EditRate.Denominator) {
+		if (verbose) {
+			std::cout << "EditRate.Denominator differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.ContainerDuration != check_desc.ContainerDuration) {
+		if (verbose) {
+			std::cout << "EditRate.ContainerDuration differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.FirstFrame != check_desc.FirstFrame) {
+		if (verbose) {
+			std::cout << "EditRate.FirstFrame differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.MaxChannelCount != check_desc.MaxChannelCount) {
+		if (verbose) {
+			std::cout << "EditRate.MaxChannelCount differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.MaxObjectCount != check_desc.MaxObjectCount) {
+		if (verbose) {
+			std::cout << "EditRate.MaxObjectCount differs.\n";
+		}
+		return false;
+	}
+	if (ref_desc.AtmosVersion != check_desc.AtmosVersion) {
+		if (verbose) {
+			std::cout << "EditRate.AtmosVersion differs.\n";
+		}
+		return false;
+	}
+
+	ASDCP::DCData::FrameBuffer ref_buffer (Kumu::Megabyte);
+	ASDCP::DCData::FrameBuffer check_buffer (Kumu::Megabyte);
+	for (size_t i = 0; i < ref_desc.ContainerDuration; ++i) {
+		ref_reader.ReadFrame (i, ref_buffer, 0);
+		check_reader.ReadFrame (i, check_buffer, 0);
+		if (memcmp(ref_buffer.RoData(), check_buffer.RoData(), ref_buffer.Size())) {
+			if (verbose) {
+				std::cout << "data differs.\n";
+			}
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
 void
 check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold)
 {
@@ -297,6 +376,14 @@ note (dcp::NoteType t, string n)
 	}
 }
 
+
+void
+check_dcp (boost::filesystem::path ref, shared_ptr<const Film> film)
+{
+	check_dcp (ref, film->dir(film->dcp_name()));
+}
+
+
 void
 check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 {
@@ -523,3 +610,17 @@ make_random_file (boost::filesystem::path path, size_t size)
 	fclose (r);
 	free (buffer);
 }
+
+
+LogSwitcher::LogSwitcher (shared_ptr<Log> log)
+	: _old (dcpomatic_log)
+{
+	dcpomatic_log = log;
+}
+
+
+LogSwitcher::~LogSwitcher ()
+{
+	dcpomatic_log = _old;
+}
+