X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=93c4475918f9182b08648c6482b2cf0fa38b0b88;hp=968c3bdf910eb0265441739ae4b07a7783cfb172;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=04533b9cf34ce8089113015715083ee9c5b2b001

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 968c3bdf9..93c447591 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -25,14 +26,16 @@
  *  it probably should.
  */
 
-#include <vector>
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #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>
 
 using std::cerr;
 using std::vector;
@@ -41,10 +44,10 @@ using boost::shared_ptr;
 using boost::optional;
 
 static void
-check (FFmpegDecoder& decoder, int frame)
+check (shared_ptr<FFmpegDecoder> decoder, int frame)
 {
 	list<ContentVideo> v;
-	v = decoder.get_video (frame, true);
+	v = decoder->video->get (frame, true);
 	BOOST_CHECK (v.size() == 1);
 	BOOST_CHECK_EQUAL (v.front().frame, frame);
 }
@@ -59,11 +62,11 @@ test (boost::filesystem::path file, vector<int> frames)
 	}
 
 	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 (film, path));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 	shared_ptr<Log> log (new NullLog);
-	FFmpegDecoder decoder (content, log);
+	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
 	for (vector<int>::const_iterator i = frames.begin(); i != frames.end(); ++i) {
 		check (decoder, *i);
@@ -73,7 +76,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);
@@ -82,13 +85,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);
 }
-