Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;

[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 76124786e8bb611be7fc44c30bf6a17d50ef3877..3274fd8a907054a477665b24ce616d4a2180d6f5 100644 (file)
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -17,6 +17,14 @@
 
 */
 
+/** @file  test/ffmpeg_decoder_seek_test.cc
+ *  @brief Check that get_video() returns the frame indexes that we ask for
+ *  for FFmpegDecoder.
+ *
+ *  This doesn't check that the contents of those frames are right, which
+ *  it probably should.
+ */
+
 #include <vector>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
@@ -28,16 +36,17 @@
 
 using std::cerr;
 using std::vector;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
 static void
 check (FFmpegDecoder& decoder, int frame)
 {
-       optional<ContentVideo> v;
+       list<ContentVideo> v;
        v = decoder.get_video (frame, true);
-       BOOST_CHECK (v);
-       BOOST_CHECK_EQUAL (v->frame, frame);
+       BOOST_CHECK (v.size() == 1);
+       BOOST_CHECK_EQUAL (v.front().frame, frame);
 }
 
 static void
@@ -51,7 +60,7 @@ test (boost::filesystem::path file, vector<int> frames)
 
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, path)); 
-       film->examine_and_add_content (content);
+       film->examine_and_add_content (content, true);
        wait_for_jobs ();
        shared_ptr<Log> log (new NullLog);
        FFmpegDecoder decoder (content, log);