using std::cout;
using boost::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
static optional<ContentVideo> stored;
static bool
}
static void
-check (shared_ptr<const Film> film, shared_ptr<FFmpegDecoder> decoder, int frame)
+check (shared_ptr<FFmpegDecoder> decoder, int frame)
{
BOOST_REQUIRE (decoder->ffmpeg_content()->video_frame_rate ());
- decoder->seek (film, ContentTime::from_frames (frame, decoder->ffmpeg_content()->video_frame_rate().get()), true);
+ decoder->seek (ContentTime::from_frames (frame, decoder->ffmpeg_content()->video_frame_rate().get()), true);
stored = optional<ContentVideo> ();
- while (!decoder->pass(film) && !stored) {}
+ while (!decoder->pass() && !stored) {}
BOOST_CHECK (stored->frame <= frame);
}
static void
test (boost::filesystem::path file, vector<int> frames)
{
- 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_seek_test_" + file.string());
shared_ptr<FFmpegContent> content (new FFmpegContent (path));
film->examine_and_add_content (content);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
decoder->video->Data.connect (bind (&store, _1));
for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
- check (film, decoder, *i);
+ check (decoder, *i);
}
}