/*
- 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.
#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>
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 ()
}
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;
*/
#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
}
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);
}