X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=f81ebda9cfdfc9bc5991691bd5312259177d8be2;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=452531a033f443b7eec3bb53f5626681bbf08cf0;hpb=5927eb82754ce916cd00eae4d7c302b17c36ae36;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 452531a03..f81ebda9c 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -21,11 +21,11 @@
 /** @file  test/ffmpeg_decoder_sequential_test.cc
  *  @brief Check that the FFmpeg decoder and Player produce sequential frames without gaps or dropped frames;
  *  Also that the decoder picks up frame rates correctly.
+ *  @ingroup feature
  */
 
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/null_log.h"
 #include "lib/content_video.h"
 #include "lib/video_decoder.h"
 #include "lib/film.h"
@@ -39,9 +39,13 @@
 using std::cout;
 using std::cerr;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
 static DCPTime next;
 static DCPTime frame;
@@ -49,23 +53,22 @@ static DCPTime frame;
 static void
 check (shared_ptr<PlayerVideo>, DCPTime time)
 {
-	BOOST_CHECK (time == next);
+	BOOST_REQUIRE (time == next);
 	next += frame;
 }
 
 void
 ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
 {
-	boost::filesystem::path path = private_data / file;
+	boost::filesystem::path path = TestPaths::private_data() / file;
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+	shared_ptr<FFmpegContent> content (new FFmpegContent(path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
-	shared_ptr<Log> log (new NullLog);
-	shared_ptr<Player> player (new Player (film, film->playlist()));
+	shared_ptr<Player> player (new Player(film));
 
 	BOOST_REQUIRE (content->video_frame_rate());
 	BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
@@ -75,13 +78,12 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	next = DCPTime ();
 	frame = DCPTime::from_frames (1, film->video_frame_rate ());
 	while (!player->pass()) {}
-	cout << to_string(next) << " " << to_string(DCPTime::from_frames (video_length, film->video_frame_rate())) << "\n";
-	BOOST_CHECK (next == DCPTime::from_frames (video_length, film->video_frame_rate()));
+	BOOST_REQUIRE (next == DCPTime::from_frames (video_length, film->video_frame_rate()));
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
-	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 6911);
+	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 6912);
 	ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 1253);
-	ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 2879);
+	ffmpeg_decoder_sequential_test_one ("prophet_long_clip.mkv", 23.976, 2879);
 }