Implement alpha_blend for YUV420P and YUV420P10. Improve unit test.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index d3180434d082307896f4c0e201d3eaa9336fdd64..85c36c16c0038910242def9a57ed7ed05ed71e84 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -40,7 +40,6 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 #include <list>
 #include <vector>
 #include <iostream>
@@ -54,7 +53,6 @@ using std::list;
 using std::abs;
 using boost::shared_ptr;
 using boost::scoped_array;
-using boost::make_shared;
 
 boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
@@ -74,16 +72,18 @@ struct TestConfig
        {
                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 ();
        }
@@ -114,7 +114,7 @@ new_test_film (string name)
                boost::filesystem::remove_all (p);
        }
 
-       shared_ptr<Film> film = boost::make_shared<Film> (p.string());
+       shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
        film->write_metadata ();
        return film;
 }
@@ -162,6 +162,22 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
        }
 }
 
+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 ());
+       DCPOMATIC_ASSERT (ref_image.compare (check_image));
+}
+
 void
 check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
@@ -176,8 +192,7 @@ 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);
@@ -186,7 +201,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
                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;
                }
@@ -241,7 +256,10 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
        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 ();
@@ -293,7 +311,7 @@ check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
        check_xml (ref_root, test_root, ignore);
 }
 
-void
+bool
 wait_for_jobs ()
 {
        JobManager* jm = JobManager::instance ();
@@ -324,11 +342,14 @@ wait_for_jobs ()
 
        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;
@@ -336,6 +357,6 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
                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 ());
 }