X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=b5142bd63fc95c20b07ee0db0f4c6a923481bd98;hb=3e56e4126ec8199f15e03c213b37f39d72c27cc3;hp=74d967a46c28a57128cc94a907c71bedcf90c03e;hpb=3d48669c9cba480cf83775cafd2a66033007c030;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 74d967a46..b5142bd63 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -22,7 +22,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/date_time.hpp>
-#include "format.h"
+#include <libdcp/dcp.h>
+#include "ratio.h"
 #include "film.h"
 #include "filter.h"
 #include "job_manager.h"
@@ -35,20 +36,23 @@
 #include "server.h"
 #include "cross.h"
 #include "job.h"
-#include "subtitle.h"
 #include "scaler.h"
 #include "ffmpeg_decoder.h"
 #include "sndfile_decoder.h"
-#include "trimmer.h"
+#include "dcp_content_type.h"
 #include "ui_signaller.h"
+#include "ratio.h"
 #define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE dvdomatic_test
+#define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
 
 using std::string;
 using std::list;
 using std::stringstream;
 using std::vector;
+using std::min;
+using std::cout;
+using std::cerr;
 using boost::shared_ptr;
 using boost::thread;
 using boost::dynamic_pointer_cast;
@@ -57,13 +61,13 @@ struct TestConfig
 {
 	TestConfig()
 	{
-		dvdomatic_setup();
+		dcpomatic_setup();
 
 		Config::instance()->set_num_local_encoding_threads (1);
 		Config::instance()->set_servers (vector<ServerDescription*> ());
 		Config::instance()->set_server_port (61920);
 		Config::instance()->set_default_dci_metadata (DCIMetadata ());
-		Config::instance()->set_default_format (static_cast<Format*> (0));
+		Config::instance()->set_default_container (static_cast<Ratio*> (0));
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 
 		ui_signaller = new UISignaller ();
@@ -72,7 +76,7 @@ struct TestConfig
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
 
-boost::filesystem::path
+static boost::filesystem::path
 test_film_dir (string name)
 {
 	boost::filesystem::path p;
@@ -82,7 +86,7 @@ test_film_dir (string name)
 	return p;
 }
 
-shared_ptr<Film>
+static shared_ptr<Film>
 new_test_film (string name)
 {
 	boost::filesystem::path p = test_film_dir (name);
@@ -90,19 +94,97 @@ new_test_film (string name)
 		boost::filesystem::remove_all (p);
 	}
 	
-	return shared_ptr<Film> (new Film (p.string(), false));
+	shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
+	f->write_metadata ();
+	return f;
 }
 
+static void
+check_file (string ref, string 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");
+	BOOST_CHECK (ref_file);
+	FILE* check_file = fopen (check.c_str(), "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];
+
+	while (N) {
+		uintmax_t this_time = min (uintmax_t (buffer_size), N);
+		size_t r = fread (ref_buffer, 1, this_time, ref_file);
+		BOOST_CHECK_EQUAL (r, this_time);
+		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);
+		N -= this_time;
+	}
+
+	delete[] ref_buffer;
+	delete[] check_buffer;
+
+	fclose (ref_file);
+	fclose (check_file);
+}
+
+static void
+note (libdcp::NoteType, string n)
+{
+	cout << n << "\n";
+}
+
+static void
+check_dcp (string ref, string check)
+{
+	libdcp::DCP ref_dcp (ref);
+	ref_dcp.read ();
+	libdcp::DCP check_dcp (check);
+	check_dcp.read ();
+
+	libdcp::EqualityOptions options;
+	options.max_mean_pixel_error = 5;
+	options.max_std_dev_pixel_error = 5;
+	options.max_audio_sample_error = 255;
+	options.cpl_names_can_differ = true;
+	options.mxf_names_can_differ = true;
+	
+	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
+}
+
+void
+wait_for_jobs ()
+{
+	JobManager* jm = JobManager::instance ();
+	while (jm->work_to_do ()) {}
+	if (jm->errors ()) {
+		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
+			cerr << (*i)->error_summary () << "\n"
+			     << (*i)->error_details () << "\n";
+		}
+	}
+		
+	BOOST_CHECK (!jm->errors());
+}
+
+#include "play_test.cc"
+#include "frame_rate_test.cc"
+#include "silence_padding_test.cc"
+#include "audio_delay_test.cc"
+#include "ffmpeg_pts_offset.cc"
+#include "ffmpeg_examiner_test.cc"
+#include "black_fill_test.cc"
+#include "scaling_test.cc"
+#include "ratio_test.cc"
 #include "pixel_formats_test.cc"
 #include "make_black_test.cc"
-#include "trimmer_test.cc"
 #include "film_metadata_test.cc"
 #include "stream_test.cc"
-#include "format_test.cc"
 #include "util_test.cc"
-#include "film_test.cc"
-#include "dcp_test.cc"
-#include "frame_rate_test.cc"
+#include "ffmpeg_dcp_test.cc"
 #include "job_test.cc"
 #include "client_server_test.cc"
 #include "image_test.cc"