X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=767ea6727d35f6f7d512fc3822cce3088217857c;hb=8f7efc8c704891a9c5499c17fa89fe84cdf5bde4;hp=9a14c5adbdb1695a5ef890b5c41bfb637361e315;hpb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 9a14c5adb..767ea6727 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -22,13 +22,14 @@
  *  (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"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/null_log.h"
 #include "lib/film.h"
 #include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 using std::cout;
 using std::cerr;
@@ -36,9 +37,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)) {
@@ -47,30 +47,26 @@ 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)); 
+	shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
 	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, false));
 
-	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) {
+	BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
+
+	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);
 	}
-#ifdef DCPOMATIC_DEBUG	
-	BOOST_CHECK_EQUAL (decoder.test_gaps, 0);
+#ifdef DCPOMATIC_DEBUG
+	BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
 #endif
 }
 
@@ -78,6 +74,8 @@ 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);
 }
-