print_time (DCPTime t, float fps)
{
stringstream s;
- s << t << " " << t.seconds() << "s " << t.frames (fps) << "f";
+ s << t.seconds() << "s " << t.frames (fps) << "f";
return s.str ();
}
BOOST_CHECK (first_video.get() >= t);
BOOST_CHECK (first_audio.get() >= t);
/* And should be rounded to frame boundaries */
- BOOST_CHECK (first_video.get() == first_video.get().round_up (film->video_frame_rate()));
- BOOST_CHECK (first_audio.get() == first_audio.get().round_up (film->audio_frame_rate()));
+ BOOST_CHECK_EQUAL (first_video.get(), first_video.get().round_up (film->video_frame_rate()));
+ BOOST_CHECK_EQUAL (first_audio.get(), first_audio.get().round_up (film->audio_frame_rate()));
}
/* Test basic seeking */
film->set_name ("ffmpeg_seek_test");
film->set_container (Ratio::from_id ("185"));
shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
- c->set_ratio (Ratio::from_id ("185"));
+ c->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (c);
wait_for_jobs ();