X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=e30143b1819d18aa2c96c673855b812a8eedeaaa;hb=d3f97ca7ca2877689f4ed59482e935431d43f027;hp=8ff43a4ca6d8cf8b22945403520168e92b8f34e1;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc index 8ff43a4ca..e30143b18 100644 --- a/test/skip_frame_test.cc +++ b/test/skip_frame_test.cc @@ -21,6 +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 * * @see test/repeat_frame_test.cc */ @@ -40,18 +41,19 @@ BOOST_AUTO_TEST_CASE (skip_frame_test) shared_ptr film = new_test_film ("skip_frame_test"); film->set_name ("skip_frame_test"); film->set_container (Ratio::from_id ("185")); - film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); - shared_ptr c (new FFmpegContent (film, "test/data/count300bd48.m2ts")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + film->set_interop (false); + 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.