summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-04-11 09:46:35 +0100
committerCarl Hetherington <cth@carlh.net>2014-04-11 09:46:35 +0100
commitc190bba821e60611bfeb59a54b73541fb529522a (patch)
tree9a462a057eefa7b60939779aae03294219d97314
parent8c3262fac829c8281b2472ddd0b0e3899e341613 (diff)
Fix test.
-rw-r--r--test/seek_zero_test.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 150e12d90..03968ae5c 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -47,9 +47,18 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
film->examine_and_add_content (content);
wait_for_jobs ();
+ /* 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();
+ if (video_delay < ContentTime ()) {
+ video_delay = ContentTime ();
+ }
+
+ VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
+
FFmpegDecoder decoder (content, film->log());
- optional<ContentVideo> a = decoder.get_video (0, true);
- optional<ContentVideo> b = decoder.get_video (0, true);
- BOOST_CHECK_EQUAL (a->frame, 0);
- BOOST_CHECK_EQUAL (b->frame, 0);
+ optional<ContentVideo> a = decoder.get_video (first_frame, true);
+ BOOST_CHECK (a);
+ BOOST_CHECK_EQUAL (a->frame, first_frame);
}