X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=3548d15f2a518ea74889ee55befe75d0749d628a;hb=0c3f91403eee01d4a1b2d2c520893de3a884a72d;hp=22ab61624e3c21bbeecc83c2195700bfe01b31be;hpb=43494601da412259814fdb1345950329cc4aa849;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 22ab61624..3548d15f2 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -25,10 +25,13 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
 #include "lib/null_log.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.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,8 +39,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-static void
-test (boost::filesystem::path file, float fps, int gaps)
+void
+ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length)
 {
 	boost::filesystem::path path = private_data / file;
 	if (!boost::filesystem::exists (path)) {
@@ -52,29 +55,29 @@ test (boost::filesystem::path file, float fps, int gaps)
 	shared_ptr<Log> log (new NullLog);
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-	BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01);
+	BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
+	BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);
 
-	Frame const N = decoder->video_content()->video_length();
 #ifdef DCPOMATIC_DEBUG
-	decoder->test_gaps = 0;
+	decoder->video->test_gaps = 0;
 #endif
-	for (Frame i = 0; i < N; ++i) {
+	for (Frame i = 0; i < video_length; ++i) {
 		list<ContentVideo> v;
-		v = decoder->get_video (i, true);
-		BOOST_CHECK_EQUAL (v.size(), 1U);
+		v = decoder->video->get (i, true);
+		BOOST_REQUIRE_EQUAL (v.size(), 1U);
 		BOOST_CHECK_EQUAL (v.front().frame, i);
 	}
 #ifdef DCPOMATIC_DEBUG
-	BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
+	BOOST_CHECK_EQUAL (decoder->video->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);
+	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 0, 6910);
+	ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 0, 1248);
 	/* 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);
+	ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 12, 2875);
 }