Move Resampler into Piece.

[dcpomatic.git] / test / ffmpeg_decoder_seek_test.cc

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 7ee225d510943e3bf56998ad46a1608a052b1e5e..4d796d1165364970b18c79bc7cf3ddc3c56d1609 100644 (file)
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/ffmpeg_decoder_seek_test.cc
  *  @brief Check seek() with FFmpegDecoder.
- *  @ingroup specific
+ *  @ingroup selfcontained
  *
  *  This doesn't check that the contents of those frames are right, which
  *  it probably should.
@@ -28,9 +28,9 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/null_log.h"
 #include "lib/film.h"
-#include "lib/content_video.h"
+#include "lib/null_log.h"
+#include "lib/piece_video.h"
 #include "lib/video_decoder.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -39,18 +39,23 @@
 #include <iostream>
 
 using std::cerr;
-using std::vector;
-using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::vector;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
-static optional<ContentVideo> stored;
+static optional<Frame> stored_frame;
+
 static bool
-store (ContentVideo v)
+store (Frame frame)
 {
-       stored = v;
+       stored_frame = frame;
        return true;
 }
 
@@ -59,9 +64,9 @@ check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
        BOOST_REQUIRE (decoder->ffmpeg_content()->video_frame_rate ());
        decoder->seek (ContentTime::from_frames (frame, decoder->ffmpeg_content()->video_frame_rate().get()), true);
-       stored = optional<ContentVideo> ();
-       while (!decoder->pass() && !stored) {}
-       BOOST_CHECK (stored->frame <= frame);
+       stored_frame = {};
+       while (!decoder->pass() && !stored_frame) {}
+       BOOST_CHECK (*stored_frame <= frame);
 }
 
 static void
@@ -71,11 +76,11 @@ test (boost::filesystem::path file, vector<int> frames)
        BOOST_REQUIRE (boost::filesystem::exists (path));
 
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
-       shared_ptr<FFmpegContent> content (new FFmpegContent (path));
+       auto content = make_shared<FFmpegContent>(path);
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
-       shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
-       decoder->video->Data.connect (bind (&store, _1));
+       auto decoder = make_shared<FFmpegDecoder>(film, content);
+       decoder->video->Data.connect (bind (&store, _2));
 
        for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
                check (decoder, *i);