Try comparing images using RMS error metric.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 15fd6a3ab14a6dcec6d3770bd9fabc8f52dc4203..41b845f85626c38859f45c3bbeb0af554575b3e3 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -236,7 +236,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check)
        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);
+       double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
+       BOOST_CHECK_MESSAGE (dist < 0.001, ref << " differs from " << check << " " << dist);
 }
 
 void
@@ -422,55 +423,11 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file, string
        m.write (file.string ());
 }
 
-class Reader
-{
-public:
-       Reader (boost::filesystem::path file)
-       {
-               format_context = avformat_alloc_context ();
-               BOOST_REQUIRE (format_context);
-               BOOST_REQUIRE (avformat_open_input (&format_context, file.string().c_str(), 0, 0) >= 0);
-               BOOST_REQUIRE (avformat_find_stream_info (format_context, 0) >= 0);
-       }
-
-       ~Reader ()
-       {
-               avformat_close_input (&format_context);
-       }
-
-       AVFormatContext* format_context;
-};
-
-
 void
-check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check, int skip_packet_stream)
+check_ffmpeg (boost::filesystem::path ref, boost::filesystem::path check)
 {
-       Reader ref_r (ref);
-       Reader check_r (check);
-
-       BOOST_REQUIRE_EQUAL (ref_r.format_context->nb_streams, check_r.format_context->nb_streams);
-
-       AVPacket ref_p;
-       AVPacket check_p;
-
-       bool skipped = false;
-
-       while (true) {
-               int p = av_read_frame (ref_r.format_context, &ref_p);
-               int q = av_read_frame (check_r.format_context, &check_p);
-               if (ref_p.stream_index == skip_packet_stream && check_p.stream_index == skip_packet_stream && !skipped) {
-                       skipped = true;
-                       continue;
-               }
-               BOOST_REQUIRE_EQUAL (p, q);
-               BOOST_REQUIRE (p == 0 || p == AVERROR_EOF);
-               if (p == AVERROR_EOF) {
-                       break;
-               }
-
-               BOOST_REQUIRE_EQUAL (ref_p.buf->size, check_p.buf->size);
-               BOOST_REQUIRE_EQUAL (memcmp (ref_p.buf->data, check_p.buf->data, ref_p.buf->size), 0);
-       }
+       int const r = system (string("ffcmp " + ref.string() + " " + check.string()).c_str());
+       BOOST_REQUIRE_EQUAL (WEXITSTATUS(r), 0);
 }
 
 void