summaryrefslogtreecommitdiff
path: root/test/ffmpeg_decoder_seek_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
commit84012cdd64f451891febd36154b7226ea21a899b (patch)
tree096fb898aa14d936dfc8f8598a6908337508233c /test/ffmpeg_decoder_seek_test.cc
parent254b3044d72de6b033d7c584f5abd2b9aa70aad5 (diff)
Put Film pointer into Decoder.
Diffstat (limited to 'test/ffmpeg_decoder_seek_test.cc')
-rw-r--r--test/ffmpeg_decoder_seek_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index c6fae48cd..b8bfe3532 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -54,12 +54,12 @@ store (ContentVideo v)
}
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);
}
@@ -77,7 +77,7 @@ test (boost::filesystem::path file, vector<int> frames)
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);
}
}