X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=d096e50e505f65783c7ebf1ee083c45f42d7fe9b;hb=fa85cc6352a2f25bdd1d4421c9490f9fca266e04;hp=b98b80334fa5e232b3060960c94ae37257b0d064;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index b98b80334..d096e50e5 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,42 +18,45 @@
 
 */
 
+
 /** @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 feature
  *
  *  @see test/repeat_frame_test.cc
  */
 
+
+#include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 
-using boost::shared_ptr;
-using boost::make_shared;
+
+using std::shared_ptr;
+using std::make_shared;
+
 
 BOOST_AUTO_TEST_CASE (skip_frame_test)
 {
-	shared_ptr<Film> film = new_test_film ("skip_frame_test");
+	auto 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<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/count300bd48.m2ts");
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	film->set_interop (false);
+	auto c = make_shared<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 ();
+	make_and_verify_dcp (film);
 
 	/* Should be white numbers on a black background counting up from 2 in steps of 2
 	   up to 300.