Bump version

[dcpomatic.git] / test / ffmpeg_encoder_test.cc

diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index e6cff9b8fdfb57df583e57e3d7342a56ff8f9bb5..c847619d976e1835a9de6cb508980004e1a59593 100644 (file)
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_h264_1)
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
        s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-       s->subtitle->set_shadow (true);
+       s->subtitle->set_effect (dcp::SHADOW);
        s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
        film->write_metadata();
 
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_h264_2)
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
        s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-       s->subtitle->set_shadow (true);
+       s->subtitle->set_effect (dcp::SHADOW);
        s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
        film->write_metadata();
 
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_prores_1)
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
        s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-       s->subtitle->set_shadow (true);
+       s->subtitle->set_effect (dcp::SHADOW);
        s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
        film->write_metadata();
 
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_test_subs_prores_2)
        film->examine_and_add_content (s);
        BOOST_REQUIRE (!wait_for_jobs ());
        s->subtitle->set_colour (dcp::Colour (255, 255, 0));
-       s->subtitle->set_shadow (true);
+       s->subtitle->set_effect (dcp::SHADOW);
        s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255));
 
        shared_ptr<Job> job (new TranscodeJob (film));
@@ -221,8 +221,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_basic_test_mixdown)
        FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_basic_test_mixdown.mp4", FFmpegEncoder::FORMAT_H264, true);
        encoder.go ();
 
-       /* Skip the first video packet when checking as it contains x264 options which can vary between machines
-          (e.g. number of threads used for encoding).
-       */
-       check_ffmpeg ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4");
+       check_ffmpeg ("build/test/ffmpeg_encoder_basic_test_mixdown.mp4", "test/data/ffmpeg_encoder_basic_test_mixdown.mp4", 1);
 }