Change video content scaling so that it either:

[dcpomatic.git] / test / ffmpeg_decoder_sequential_test.cc

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 2fec7a37efea28b0bf47fd2182ad121787310259..d761d946556291db329d92d297cee36edc80b206 100644 (file)
--- 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 specific
  */
 
 #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"
@@ -42,6 +42,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 static DCPTime next;
 static DCPTime frame;
@@ -49,23 +50,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,12 +75,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()) {}
-       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);
 }