X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=c7a8bbed6cc52fd4a0f0c8d17d1cabfc881dcab7;hb=c66f02ac13e508deecea70898397f7e8a8d37d9e;hp=551f64dbde9bd74755e6672a6af4ce7724922cb7;hpb=ec6b451c615134984688a2085d6c3f9fcfa870bc;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 551f64dbd..c7a8bbed6 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,6 +34,8 @@
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
+#include "lib/compose.hpp"
+#include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -67,7 +69,7 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
-boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
+boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
 
 void
 setup_test_config ()
@@ -229,7 +231,7 @@ 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;
@@ -246,7 +248,7 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
 	*/
 #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);
+	BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist);
 #else
 	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
 #endif
@@ -436,9 +438,9 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file, string
 }
 
 void
-check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check)
+check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int audio_tolerance)
 {
-	int const r = system (string("ffcmp " + ref.string() + " " + check.string()).c_str());
+	int const r = system (String::compose("ffcmp -t %1 %2 %3", audio_tolerance, ref.string(), check.string()).c_str());
 	BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0);
 }
 
@@ -450,19 +452,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);
+	shared_ptr<dcp::OpenJPEGImage> image = frame->xyz_image ();
+	shared_ptr<dcp::OpenJPEGImage> ref_image = ref_frame->xyz_image ();
 
-	FILE* ref_file = fopen_boost(ref, "rb");
-	BOOST_REQUIRE (ref_file);
+	BOOST_REQUIRE (image->size() == ref_image->size());
 
-	uint8_t* ref_data = new uint8_t[ref_size];
-	fread (ref_data, ref_size, 1, ref_file);
-	fclose (ref_file);
-
-	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