Fix or remove several broken pixel formats in Image::fade and add

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 9e168b1e21c5cca692c69ea7ad04bdd771432819..c87f4e70b736d9c4e8d561fd8b9c1d0ca22a4fbc 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -231,13 +231,9 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 }
 
 void
-check_image (boost::filesystem::path ref, boost::filesystem::path check)
+check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
        using namespace MagickCore;
-#else
-       using namespace MagickLib;
-#endif
 
        Magick::Image ref_image;
        ref_image.read (ref.string ());
@@ -246,12 +242,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
        /* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it;
           this may cause random test failures on platforms that use GraphicsMagick.
        */
-#ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE
        double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
-       BOOST_CHECK_MESSAGE (dist < 0.01, ref << " differs from " << check << " " << dist);
-#else
-       BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
-#endif
+       BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist);
 }
 
 void
@@ -427,11 +419,7 @@ wait_for_jobs ()
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
-               using namespace MagickCore;
-#else
-               using namespace MagickLib;
-#endif
+       using namespace MagickCore;
 
        Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
        m.write (file.string ());
@@ -452,19 +440,22 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
        shared_ptr<dcp::MonoPictureAsset> asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
        BOOST_REQUIRE (asset);
        shared_ptr<const dcp::MonoPictureFrame> frame = asset->start_read()->get_frame(index);
+       shared_ptr<const dcp::MonoPictureFrame> ref_frame (new dcp::MonoPictureFrame (ref));
 
-       boost::uintmax_t const ref_size = boost::filesystem::file_size(ref);
-       BOOST_CHECK_EQUAL (frame->j2k_size(), ref_size);
-
-       FILE* ref_file = fopen_boost(ref, "rb");
-       BOOST_REQUIRE (ref_file);
+       shared_ptr<dcp::OpenJPEGImage> image = frame->xyz_image ();
+       shared_ptr<dcp::OpenJPEGImage> ref_image = ref_frame->xyz_image ();
 
-       uint8_t* ref_data = new uint8_t[ref_size];
-       fread (ref_data, ref_size, 1, ref_file);
-       fclose (ref_file);
+       BOOST_REQUIRE (image->size() == ref_image->size());
 
-       BOOST_CHECK (memcmp(ref_data, frame->j2k_data(), ref_size) == 0);
-       delete[] ref_data;
+       int off = 0;
+       for (int y = 0; y < ref_image->size().height; ++y) {
+               for (int x = 0; x < ref_image->size().width; ++x) {
+                       BOOST_REQUIRE_EQUAL (ref_image->data(0)[off], image->data(0)[off]);
+                       BOOST_REQUIRE_EQUAL (ref_image->data(1)[off], image->data(1)[off]);
+                       BOOST_REQUIRE_EQUAL (ref_image->data(2)[off], image->data(2)[off]);
+                       ++off;
+               }
+       }
 }
 
 boost::filesystem::path
@@ -478,3 +469,29 @@ dcp_file (shared_ptr<const Film> film, string prefix)
        BOOST_REQUIRE (i != boost::filesystem::directory_iterator());
        return i->path();
 }
+
+boost::filesystem::path
+subtitle_file (shared_ptr<Film> film)
+{
+       for (
+               boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false));
+               i != boost::filesystem::directory_iterator ();
+               ++i) {
+
+               if (boost::filesystem::is_directory (i->path ())) {
+                       for (
+                               boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
+                               j != boost::filesystem::directory_iterator ();
+                               ++j) {
+
+                               if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
+                                       return j->path();
+                               }
+                       }
+               }
+       }
+
+       BOOST_REQUIRE (false);
+       /* Remove warning */
+       return boost::filesystem::path("/");
+}