Apply the remainder of a 1.x patch; a test.

[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 b4ff36e6eed0848624fcd8aabb019023252f056b..c5f43173ea57b55ada9eb972c2da0cdd8845a008 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -36,9 +36,8 @@ 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)) {
@@ -56,24 +55,27 @@ test (boost::filesystem::path file, float fps, int first)
        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 ());
+#ifdef DCPOMATIC_DEBUG 
        decoder.test_gaps = 0;
+#endif 
        for (VideoFrame i = 0; i < N; ++i) {
                list<ContentVideo> v;
                v = decoder.get_video (i, true);
-               if (i < first) {
-                       BOOST_CHECK (v.empty ());
-               } else {
-                       BOOST_CHECK (v.size() == 1);
-                       BOOST_CHECK_EQUAL (v.front().frame, i);
-               }
+               BOOST_CHECK_EQUAL (v.size(), 1);
+               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);
 }