X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=d761d946556291db329d92d297cee36edc80b206;hp=03bf9e2ce3adfe0de8e4de5df599e05e402577ce;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=8262bd666ebc26d2742e01c4996bcc5bfc57ce8b

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 03bf9e2ce..d761d9465 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -1,31 +1,36 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @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.
+ *  @brief Check that the FFmpeg decoder and Player produce sequential frames without gaps or dropped frames;
+ *  Also that the decoder picks up frame rates correctly.
+ *  @ingroup specific
  */
 
 #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 "lib/player_video.h"
+#include "lib/player.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
@@ -36,45 +41,46 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using boost::bind;
+using namespace dcpomatic;
+
+static DCPTime next;
+static DCPTime frame;
 
 static void
-test (boost::filesystem::path file, float fps, int gaps, int video_length)
+check (shared_ptr<PlayerVideo>, DCPTime time)
+{
+	BOOST_REQUIRE (time == next);
+	next += frame;
+}
+
+void
+ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
 {
-	boost::filesystem::path path = private_data / file;
-	if (!boost::filesystem::exists (path)) {
-		cerr << "Skipping test: " << path.string() << " not found.\n";
-		return;
-	}
-
-	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+	boost::filesystem::path path = TestPaths::private_data / file;
+	BOOST_REQUIRE (boost::filesystem::exists (path));
+
+	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
+	shared_ptr<FFmpegContent> content (new FFmpegContent(path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
-	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);
-
-#ifdef DCPOMATIC_DEBUG
-	decoder->test_gaps = 0;
-#endif
-	for (Frame i = 0; i < video_length; ++i) {
-		list<ContentVideo> v;
-		v = decoder->get_video (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);
-#endif
+	BOOST_REQUIRE (!wait_for_jobs());
+	film->write_metadata ();
+	shared_ptr<Player> player (new Player(film));
+
+	BOOST_REQUIRE (content->video_frame_rate());
+	BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
+
+	player->Video.connect (bind (&check, _1, _2));
+
+	next = DCPTime ();
+	frame = DCPTime::from_frames (1, film->video_frame_rate ());
+	while (!player->pass()) {}
+	BOOST_REQUIRE (next == DCPTime::from_frames (video_length, film->video_frame_rate()));
 }
 
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
-	test ("boon_telly.mkv", 29.97, 0, 6910);
-	test ("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, 2875);
+	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 6912);
+	ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 1253);
+	ffmpeg_decoder_sequential_test_one ("prophet_long_clip.mkv", 23.976, 2879);
 }