test/data updates.

[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 e4968dedaaaa787e2f35a32605cb48fbc773485f..98c7bf9e2acffea10a4d24f5419794da987b1b79 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -47,25 +47,25 @@ test (boost::filesystem::path file, float fps, int gaps)
 
        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, true);
+       film->examine_and_add_content (content);
        wait_for_jobs ();
        shared_ptr<Log> log (new NullLog);
-       FFmpegDecoder decoder (content, log);
+       shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log));
 
-       BOOST_CHECK_CLOSE (decoder.video_content()->video_frame_rate(), fps, 0.01);
+       BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
        
-       VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
+       Frame const N = decoder->video_content()->video_length();
 #ifdef DCPOMATIC_DEBUG 
-       decoder.test_gaps = 0;
+       decoder->test_gaps = 0;
 #endif 
-       for (VideoFrame i = 0; i < N; ++i) {
+       for (Frame i = 0; i < N; ++i) {
                list<ContentVideo> v;
-               v = decoder.get_video (i, true);
-               BOOST_CHECK (v.size() == 1);
+               v = decoder->get_video (i, true);
+               BOOST_CHECK_EQUAL (v.size(), 1U);
                BOOST_CHECK_EQUAL (v.front().frame, i);
        }
 #ifdef DCPOMATIC_DEBUG 
-       BOOST_CHECK_EQUAL (decoder.test_gaps, gaps);
+       BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
 #endif
 }