X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frepeat_frame_test.cc;h=cba5e0582da30a7c314b3ae8b6aa7269d18ed678;hb=0c3f91403eee01d4a1b2d2c520893de3a884a72d;hp=73b9ad615519d2a72fbfd9e934c1d2bd2b9d544a;hpb=ec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279;p=dcpomatic.git

diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 73b9ad615..cba5e0582 100644
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,18 +17,23 @@
 
 */
 
+/** @file  test/repeat_frame_test.cc
+ *  @brief Test the repeat of frames by the player when putting a 24fps
+ *  source into a 48fps DCP.
+ *
+ *  @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"
 
 using boost::shared_ptr;
 
-/* Test the repeat of frames by the player when putting a 24fps
-   source into a 48fps DCP.
-*/
 BOOST_AUTO_TEST_CASE (repeat_frame_test)
 {
 	shared_ptr<Film> film = new_test_film ("repeat_frame_test");
@@ -36,15 +41,16 @@ BOOST_AUTO_TEST_CASE (repeat_frame_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/red_24.mp4"));
-	c->set_ratio (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
 
+	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
 	film->set_video_frame_rate (48);
 	film->make_dcp ();
 	wait_for_jobs ();
 
+	/* Should be 32 frames of red */
 	check_dcp ("test/data/repeat_frame_test", film->dir (film->dcp_name ()));
 }
-