No-op: remove all trailing whitespace.

[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 48b9b6b3bb27d8e140c706baa1dc37ebdf38fb0a..601dd1c59db7b4137f121d4e0507561d1a8d3b9d 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -32,12 +32,12 @@
 
 using std::cout;
 using std::cerr;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-/** @param black Frame index of first frame in the video */ 
 static void
-test (boost::filesystem::path file, float fps, int first)
+test (boost::filesystem::path file, float fps, int gaps)
 {
        boost::filesystem::path path = private_data / file;
        if (!boost::filesystem::exists (path)) {
@@ -46,33 +46,36 @@ test (boost::filesystem::path file, float fps, int first)
        }
 
        shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
-       shared_ptr<FFmpegContent> content (new FFmpegContent (film, path)); 
+       shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
        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);
-       
-       VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
-       decoder.test_gaps = 0;
-       for (VideoFrame i = 0; i < N; ++i) {
-               optional<ContentVideo> v;
-               v = decoder.get_video (i, true);
-               if (i < first) {
-                       BOOST_CHECK (!v);
-               } else {
-                       BOOST_CHECK (v);
-                       BOOST_CHECK_EQUAL (v->frame, i);
-               }
+       BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
+
+       Frame const N = decoder->video_content()->video_length();
+#ifdef DCPOMATIC_DEBUG
+       decoder->test_gaps = 0;
+#endif
+       for (Frame i = 0; i < N; ++i) {
+               list<ContentVideo> v;
+               v = decoder->get_video (i, true);
+               BOOST_CHECK_EQUAL (v.size(), 1U);
+               BOOST_CHECK_EQUAL (v.front().frame, i);
        }
-       BOOST_CHECK_EQUAL (decoder.test_gaps, 0);
+#ifdef DCPOMATIC_DEBUG
+       BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
+#endif
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
        test ("boon_telly.mkv", 29.97, 0);
        test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0);
+       /* The first video frame is 12 here, so VideoDecoder should see 12 gaps
+          (at the start of the file)
+       */
        test ("prophet_clip.mkv", 23.976, 12);
 }