X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=98c7bf9e2acffea10a4d24f5419794da987b1b79;hp=b4ff36e6eed0848624fcd8aabb019023252f056b;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index b4ff36e6e..98c7bf9e2 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)) {
@@ -51,29 +50,32 @@ test (boost::filesystem::path file, float fps, int first)
 	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);
+	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) {
+	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);
-		if (i < first) {
-			BOOST_CHECK (v.empty ());
-		} else {
-			BOOST_CHECK (v.size() == 1);
-			BOOST_CHECK_EQUAL (v.front().frame, i);
-		}
+		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);
 }