X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=c22cadb96e8468f3e48f8fabdda97e7e70694095;hp=77e95c28c11b5d11d42977ec2dfc02b6d26eca27;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 77e95c28c..c22cadb96 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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/>.
 
 */
 
@@ -22,20 +23,27 @@
  *  confusing things as it might in ffmpeg_seek_test).
  */
 
-#include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_decoder.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/content_video.h"
+#include "lib/video_content_scale.h"
+#include "lib/video_content.h"
+#include "lib/video_decoder.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
+#include <iostream>
 
 using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::make_shared;
 
 BOOST_AUTO_TEST_CASE (seek_zero_test)
 {
@@ -43,23 +51,23 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	film->set_name ("seek_zero_test");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, "test/data/count300bd48.m2ts");
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
+	content->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 	/* Work out the first video frame index that we will be given, taking into account
 	 * the difference between first video and first audio.
 	 */
-	ContentTime video_delay = content->first_video().get() - content->audio_stream()->first_audio.get();
+	ContentTime video_delay = content->first_video().get() - content->ffmpeg_audio_streams().front()->first_audio.get();
 	if (video_delay < ContentTime ()) {
 		video_delay = ContentTime ();
 	}
 
-	VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
+	Frame const first_frame = video_delay.round_up (content->active_video_frame_rate ()).frames_round (content->active_video_frame_rate ());
 
-	FFmpegDecoder decoder (content, film->log());
-	list<ContentVideo> a = decoder.get_video (first_frame, true);
+	FFmpegDecoder decoder (content, film->log(), false);
+	list<ContentVideo> a = decoder.video->get (first_frame, true);
 	BOOST_CHECK (a.size() == 1);
-	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
+	BOOST_CHECK_EQUAL (a.front().frame.index(), first_frame);
 }