X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=3aef113734fbebfd7092d2aa121a28808bf40819;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=e0c52e2bf492a9357d5e7d15118d4f3309b416f8;hpb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;p=dcpomatic.git

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index e0c52e2bf..3aef11373 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -28,11 +28,15 @@
 #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 "test.h"
 
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 BOOST_AUTO_TEST_CASE (seek_zero_test)
 {
@@ -41,17 +45,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_ratio (Ratio::from_id ("185"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
+	content->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->ffmpeg_audio_streams().front()->first_audio.get();
+	if (video_delay < ContentTime ()) {
+		video_delay = ContentTime ();
+	}
 
-	FFmpegDecoder decoder (film, content, true, false);
-	shared_ptr<DecodedVideo> a = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
-	decoder.seek (ContentTime(), true);
-	shared_ptr<DecodedVideo> b = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
+	Frame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
 
-	/* a will be after no seek, and b after a seek to zero, which should
-	   have the same effect.
-	*/
-	BOOST_CHECK_EQUAL (a->content_time, b->content_time);
+	FFmpegDecoder decoder (content, film->log());
+	list<ContentVideo> a = decoder.get_video (first_frame, true);
+	BOOST_CHECK (a.size() == 1);
+	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
 }