X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=c5f43173ea57b55ada9eb972c2da0cdd8845a008;hb=59e769023c392c332331567a1aea94660002c463;hp=96de9be2784e1ce5830ee7d5cf1fe180815181c2;hpb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 96de9be27..c5f43173e 100644
--- 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,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)) {
@@ -50,27 +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) {
-		optional<ContentVideo> v;
+		list<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_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
 }
 
-/** 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);
+	/* 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);
 }