X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=73eea719ff7e7ba37cb027278618d220acfbaf79;hp=50c96afed6e3cdd0c2a032500817581cb3f4e259;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 50c96afed..73eea719f 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,16 @@
 
 */
 
+
 /** @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 specific
+ *  @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"
@@ -37,16 +38,24 @@
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
-using std::cout;
+
 using std::cerr;
+using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+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;
 
+
 static void
 check (shared_ptr<PlayerVideo>, DCPTime time)
 {
@@ -54,19 +63,19 @@ check (shared_ptr<PlayerVideo>, DCPTime time)
 	next += frame;
 }
 
+
 void
 ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
 {
-	boost::filesystem::path path = private_data / file;
+	auto 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(path));
+	auto film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
+	auto content = make_shared<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()));
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 
 	BOOST_REQUIRE (content->video_frame_rate());
 	BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
@@ -79,6 +88,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	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, 6912);