X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=cf1fb818958ff4f9c34c7e4adf6525f54a7d7b97;hb=0c32e4bfd1ad6418dad2a504a4bf6cdea48f6d75;hp=9a14c5adbdb1695a5ef890b5c41bfb637361e315;hpb=94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 9a14c5adb..cf1fb8189 100644
--- 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)) {
@@ -48,7 +47,7 @@ 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)); 
-	film->examine_and_add_content (content);
+	film->examine_and_add_content (content, true);
 	wait_for_jobs ();
 	shared_ptr<Log> log (new NullLog);
 	FFmpegDecoder decoder (content, log);
@@ -62,15 +61,11 @@ test (boost::filesystem::path file, float fps, int first)
 	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);
 	}
 #ifdef DCPOMATIC_DEBUG	
-	BOOST_CHECK_EQUAL (decoder.test_gaps, 0);
+	BOOST_CHECK_EQUAL (decoder.test_gaps, gaps);
 #endif
 }
 
@@ -78,6 +73,9 @@ 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);
 }