X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frepeat_frame_test.cc;h=358e6fe8f468c5f9f98a1a6dfc9bfd1ded932ddf;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hp=d145ccb18f48591ba2242998b4dcd61a7578e449;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc index d145ccb18..358e6fe8f 100644 --- a/test/repeat_frame_test.cc +++ b/test/repeat_frame_test.cc @@ -21,6 +21,7 @@ /** @file test/repeat_frame_test.cc * @brief Test the repeat of frames by the player when putting a 24fps * source into a 48fps DCP. + * @ingroup specific * * @see test/skip_frame_test.cc */ @@ -40,18 +41,17 @@ BOOST_AUTO_TEST_CASE (repeat_frame_test) shared_ptr film = new_test_film ("repeat_frame_test"); film->set_name ("repeat_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/red_24.mp4")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST")); + film->set_interop (false); + shared_ptr c (new FFmpegContent("test/data/red_24.mp4")); film->examine_and_add_content (c); - - wait_for_jobs (); - - c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + BOOST_REQUIRE (!wait_for_jobs()); + c->video->set_custom_ratio (1.85); film->set_video_frame_rate (48); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); - /* Should be 32 frames of red */ + /* Should be 32 frames of red followed by 16 frames of black to fill the DCP up to 1 second */ check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ())); }