X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=8adcbf8b8c901c061d982b9e8b8ebb9017d84855;hp=76124786e8bb611be7fc44c30bf6a17d50ef3877;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=2c0478d2b33906845b9d910668b12fe3e8f03a7c

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 76124786e..8adcbf8b8 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -1,60 +1,81 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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/>.
 
 */
 
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
+/** @file  test/ffmpeg_decoder_seek_test.cc
+ *  @brief Check seek() with FFmpegDecoder.
+ *  @ingroup specific
+ *
+ *  This doesn't check that the contents of those frames are right, which
+ *  it probably should.
+ */
+
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
+#include "lib/null_log.h"
 #include "lib/film.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
+#include <iostream>
 
 using std::cerr;
 using std::vector;
+using std::list;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
+
+static optional<ContentVideo> stored;
+static bool
+store (ContentVideo v)
+{
+	stored = v;
+	return true;
+}
 
 static void
-check (FFmpegDecoder& decoder, int frame)
+check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
-	optional<ContentVideo> v;
-	v = decoder.get_video (frame, true);
-	BOOST_CHECK (v);
-	BOOST_CHECK_EQUAL (v->frame, frame);
+	BOOST_REQUIRE (decoder->ffmpeg_content()->video_frame_rate ());
+	decoder->seek (ContentTime::from_frames (frame, decoder->ffmpeg_content()->video_frame_rate().get()), true);
+	stored = optional<ContentVideo> ();
+	while (!decoder->pass() && !stored) {}
+	BOOST_CHECK (stored->frame <= frame);
 }
 
 static void
 test (boost::filesystem::path file, vector<int> frames)
 {
-	boost::filesystem::path path = private_data / file;
-	if (!boost::filesystem::exists (path)) {
-		cerr << "Skipping test: " << path.string() << " not found.\n";
-		return;
-	}
+	boost::filesystem::path path = TestPaths::private_data / file;
+	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	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 (path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
-	shared_ptr<Log> log (new NullLog);
-	FFmpegDecoder decoder (content, log);
+	BOOST_REQUIRE (!wait_for_jobs());
+	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
+	decoder->video->Data.connect (bind (&store, _1));
 
 	for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
 		check (decoder, *i);
@@ -64,7 +85,7 @@ test (boost::filesystem::path file, vector<int> frames)
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 {
 	vector<int> frames;
-	
+
 	frames.clear ();
 	frames.push_back (0);
 	frames.push_back (42);
@@ -73,13 +94,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 
 	test ("boon_telly.mkv", frames);
 	test ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", frames);
-	
+
 	frames.clear ();
 	frames.push_back (15);
 	frames.push_back (42);
 	frames.push_back (999);
 	frames.push_back (15);
-	
-	test ("prophet_clip.mkv", frames);
-}
 
+	test ("prophet_long_clip.mkv", frames);
+}