X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=ad8ecb09f7730b7c7913f887e9045c7d0cde9093;hb=e40e1a777ab7b39046e8ff1928354d38bd762db5;hp=2a1a061360e328fefc6721aeb09f1c9d3b7fedbc;hpb=59e769023c392c332331567a1aea94660002c463;p=dcpomatic.git diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc index 2a1a06136..ad8ecb09f 100644 --- a/test/seek_zero_test.cc +++ b/test/seek_zero_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington 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 @@ -31,6 +31,7 @@ #include "lib/ffmpeg_audio_stream.h" #include "lib/content_video.h" #include "test.h" +#include using std::cout; using std::list; @@ -48,18 +49,18 @@ BOOST_AUTO_TEST_CASE (seek_zero_test) 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->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->video_frame_rate ()).frames_round (content->video_frame_rate ()); - FFmpegDecoder decoder (content, film->log()); + FFmpegDecoder decoder (content, film->log(), false); list a = decoder.get_video (first_frame, true); BOOST_CHECK (a.size() == 1); BOOST_CHECK_EQUAL (a.front().frame, first_frame);