X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=33561206c1d8906a2f2c175b1472d4f64b2d7db6;hb=6bdca5fdc67602249baf8cb0a9bebe818c067284;hp=682fa93555742461f93f556cd714231685c51c23;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c;p=dcpomatic.git

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 682fa9355..33561206c 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -30,7 +30,11 @@
 #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 <iostream>
 
 using std::cout;
 using std::list;
@@ -45,22 +49,22 @@ BOOST_AUTO_TEST_CASE (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")));
 	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);
 }