X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frepeat_frame_test.cc;h=0d0f38616d3047a71db479863b3a9ab627e7d649;hb=HEAD;hp=be39242e7a29a20110f86084d1229fa5a9a18dad;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index be39242e7..0d0f38616 100644
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_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,40 @@
 
 */
 
+
 /** @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 feature
  *
  *  @see test/skip_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;
 
-BOOST_AUTO_TEST_CASE (repeat_frame_test)
-{
-	shared_ptr<Film> 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<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/red_24.mp4");
-	film->examine_and_add_content (c);
+using std::make_shared;
 
-	wait_for_jobs ();
 
-	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+BOOST_AUTO_TEST_CASE (repeat_frame_test)
+{
+	auto c = make_shared<FFmpegContent>("test/data/red_24.mp4");
+	auto film = new_test_film2 ("repeat_frame_test", {c});
+	film->set_interop (false);
+	c->video->set_custom_ratio (1.85);
 
 	film->set_video_frame_rate (48);
-	film->make_dcp ();
-	wait_for_jobs ();
+	make_and_verify_dcp (film);
 
-	/* Should be 32 frames of red */
-	check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
+	/* Should be 32 frames of red followed by 16 frames of black to fill the DCP up to 1 second;
+	 * no need to check sound.
+	 */
+	check_dcp("test/data/repeat_frame_test", film->dir(film->dcp_name()), true);
 }