/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
{
dcpomatic_setup ();
- Config::instance()->set_num_local_encoding_threads (1);
+ Config::instance()->set_master_encoding_threads (1);
+ 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);
Config::instance()->set_default_j2k_bandwidth (100000000);
+ Config::instance()->set_default_interop (false);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
- EncodeServerFinder::instance()->disable ();
+ EncodeServerFinder::instance()->stop ();
signal_manager = new TestSignalManager ();
}
boost::filesystem::remove_all (p);
}
- shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+ shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
film->write_metadata ();
return film;
}
}
}
+void
+check_image (boost::filesystem::path ref, boost::filesystem::path check)
+{
+#ifdef DCPOMATIC_IMAGE_MAGICK
+ using namespace MagickCore;
+#else
+ using namespace MagickLib;
+#endif
+
+ Magick::Image ref_image;
+ ref_image.read (ref.string ());
+ Magick::Image check_image;
+ check_image.read (check.string ());
+ BOOST_CHECK_MESSAGE (ref_image.compare (check_image), ref << " differs from " << check);
+}
+
void
check_file (boost::filesystem::path ref, boost::filesystem::path check)
{
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- SafeStringStream error;
- error << "File " << check.string() << " differs from reference " << ref.string();
+ string error = "File " + check.string() + " differs from reference " + ref.string();
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
- BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+ BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
xmlpp::Element::NodeList ref_children = ref->get_children ();
xmlpp::Element::NodeList test_children = test->get_children ();
- BOOST_CHECK_EQUAL (ref_children.size (), test_children.size ());
+ BOOST_CHECK_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 ();
check_xml (ref_root, test_root, ignore);
}
-void
+bool
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
if (jm->errors ()) {
JobManager::drop ();
+ return true;
}
+
+ return false;
}
void
-write_image (shared_ptr<const Image> image, boost::filesystem::path file)
+write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format)
{
#ifdef DCPOMATIC_IMAGE_MAGICK
using namespace MagickCore;
using namespace MagickLib;
#endif
- Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
+ Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
m.write (file.string ());
}