X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=3aef113734fbebfd7092d2aa121a28808bf40819;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=682fa93555742461f93f556cd714231685c51c23;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc index 682fa9355..3aef11373 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 @@ -45,19 +45,19 @@ 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 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->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 (content->video_frame_rate ()); FFmpegDecoder decoder (content, film->log()); list a = decoder.get_video (first_frame, true);