X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=928d173df0305d4f7d1839d34c46307286c5fbb2;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=fdea35849eafdf21c156b575afe7c1241ec634b1;hpb=1029bec7334fedbd8570cd8bfa5ddf954da8b3ec;p=dcpomatic.git diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc index fdea35849..928d173df 100644 --- a/test/skip_frame_test.cc +++ b/test/skip_frame_test.cc @@ -21,7 +21,7 @@ /** @file test/skip_frame_test.cc * @brief Test the skip of frames by the player when putting a 48fps * source into a 24fps DCP. - * @ingroup specific + * @ingroup feature * * @see test/repeat_frame_test.cc */ @@ -34,7 +34,7 @@ #include "lib/dcp_content_type.h" #include "lib/video_content.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (skip_frame_test) { @@ -43,17 +43,16 @@ BOOST_AUTO_TEST_CASE (skip_frame_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); film->set_interop (false); - shared_ptr c (new FFmpegContent (film, "test/data/count300bd48.m2ts")); + shared_ptr c (new FFmpegContent("test/data/count300bd48.m2ts")); film->examine_and_add_content (c); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->write_metadata (); film->set_video_frame_rate (24); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); /* Should be white numbers on a black background counting up from 2 in steps of 2 up to 300.