std::shared_ptr

[dcpomatic.git] / test / repeat_frame_test.cc

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index fd64ba018cbf47746798220f5438de28d9b17c5b..fbbaba3f152c7158e71940d43d31dcc1a5a4b785 100644 (file)
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -21,7 +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
+ *  @ingroup feature
  *
  *  @see test/skip_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 (repeat_frame_test)
 {
@@ -43,17 +43,15 @@ BOOST_AUTO_TEST_CASE (repeat_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<FFmpegContent> c (new FFmpegContent (film, "test/data/red_24.mp4"));
+       shared_ptr<FFmpegContent> 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 ()));
 }