Merge master.

[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 96de9be2784e1ce5830ee7d5cf1fe180815181c2..9a14c5adbdb1695a5ef890b5c41bfb637361e315 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -17,6 +17,11 @@
 
 */
 
+/** @file  test/ffmpeg_decoder_sequential_test.cc
+ *  @brief Check that the FFmpeg decoder produces sequential frames without gaps or dropped frames;
+ *  (dropped frames being checked by assert() in VideoDecoder).  Also that the decoder picks up frame rates correctly.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include "lib/ffmpeg_content.h"
@@ -27,6 +32,7 @@
 
 using std::cout;
 using std::cerr;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -50,27 +56,28 @@ 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) {
-               optional<ContentVideo> v;
+               list<ContentVideo> v;
                v = decoder.get_video (i, true);
                if (i < first) {
-                       BOOST_CHECK (!v);
+                       BOOST_CHECK (v.empty ());
                } else {
-                       BOOST_CHECK (v);
-                       BOOST_CHECK_EQUAL (v->frame, i);
+                       BOOST_CHECK (v.size() == 1);
+                       BOOST_CHECK_EQUAL (v.front().frame, i);
                }
        }
+#ifdef DCPOMATIC_DEBUG 
        BOOST_CHECK_EQUAL (decoder.test_gaps, 0);
+#endif
 }
 
-/** Check that the FFmpeg decoder produces sequential frames without gaps or dropped frames;
- *  (dropped frames being checked by assert() in VideoDecoder).  Also that the decoder picks up frame rates correctly.
- */
 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);
+       test ("boon_telly.mkv", 29.97, 0);
+       test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0);
        test ("prophet_clip.mkv", 23.976, 12);
 }