X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=8adcbf8b8c901c061d982b9e8b8ebb9017d84855;hb=591c73b472f0eb74225dbc1b08885f552b8814c4;hp=5e310cd3c34ca75de5ea2c0555e0a3a272731c7f;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 5e310cd3c..8adcbf8b8 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -19,8 +19,8 @@
 */
 
 /** @file  test/ffmpeg_decoder_seek_test.cc
- *  @brief Check that get_video() returns the frame indexes that we ask for
- *  for FFmpegDecoder.
+ *  @brief Check seek() with FFmpegDecoder.
+ *  @ingroup specific
  *
  *  This doesn't check that the contents of those frames are right, which
  *  it probably should.
@@ -35,40 +35,47 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
 #include <vector>
+#include <iostream>
 
 using std::cerr;
 using std::vector;
 using std::list;
+using std::cout;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::optional;
+using namespace dcpomatic;
+
+static optional<ContentVideo> stored;
+static bool
+store (ContentVideo v)
+{
+	stored = v;
+	return true;
+}
 
 static void
 check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
-	list<ContentVideo> v;
-	v = decoder->video->get (frame, true);
-	BOOST_CHECK (v.size() == 1);
-	BOOST_CHECK_EQUAL (v.front().frame.index(), 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 = make_shared<FFmpegContent> (film, path);
+	shared_ptr<FFmpegContent> content (new FFmpegContent (path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
-	shared_ptr<Log> log = make_shared<NullLog> ();
-	shared_ptr<FFmpegDecoder> decoder = make_shared<FFmpegDecoder> (content, log, false);
+	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);
@@ -94,5 +101,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 	frames.push_back (999);
 	frames.push_back (15);
 
-	test ("prophet_clip.mkv", frames);
+	test ("prophet_long_clip.mkv", frames);
 }