X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=4dceae86ba6f6416e7add63be7c0093265fad6e8;hp=968c3bdf910eb0265441739ae4b07a7783cfb172;hb=9f4cb3b340376d93be39dc97c2e0c631e9cf73c4;hpb=7b2054e2a73844450b5b55c5788c02af671812ce

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 968c3bdf9..4dceae86b 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -1,94 +1,104 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 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_seek_test.cc
- *  @brief Check that get_video() returns the frame indexes that we ask for
- *  for FFmpegDecoder.
+ *  @brief Check seek() with FFmpegDecoder.
+ *  @ingroup selfcontained
  *
  *  This doesn't check that the contents of those frames are right, which
  *  it probably should.
  */
 
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
+
+#include "lib/content_video.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/log.h"
 #include "lib/film.h"
+#include "lib/null_log.h"
+#include "lib/video_decoder.h"
 #include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+#include <iostream>
+#include <vector>
+
 
 using std::cerr;
-using std::vector;
+using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::vector;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+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)
 {
-	list<ContentVideo> v;
-	v = decoder.get_video (frame, true);
-	BOOST_CHECK (v.size() == 1);
-	BOOST_CHECK_EQUAL (v.front().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;
-	}
+	auto 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)); 
+	auto film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
+	auto content = make_shared<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());
+	auto decoder = make_shared<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);
+	for (auto i: frames) {
+		check (decoder, i);
 	}
 }
 
+
 BOOST_AUTO_TEST_CASE (ffmpeg_decoder_seek_test)
 {
-	vector<int> frames;
-	
-	frames.clear ();
-	frames.push_back (0);
-	frames.push_back (42);
-	frames.push_back (999);
-	frames.push_back (0);
+	vector<int> frames = { 0, 42, 999, 0 };
 
 	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", { 15, 42, 999, 15 });
+	test ("dolby_aurora.vob", { 0, 125, 250, 41 });
 }
-