Change video content scaling so that it either:

[dcpomatic.git] / test / skip_frame_test.cc

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 535efacdfac79a29785084b434693a847139a8b3..aea389ce301f735c3849e6bd212b8a3e34d973ba 100644 (file)
--- 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
  */
@@ -41,17 +42,17 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        film->set_name ("skip_frame_test");
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
+       film->set_interop (false);
+       shared_ptr<FFmpegContent> 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.