X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=dac7b5a25a7aa18ea79c52ec2c36e37d945b2f08;hp=4ac5192f23284d375353adb6c6487cbd4fa02504;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=015fe447cfe25babc55cf8ed282bb909e4713aa0

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 4ac5192f2..dac7b5a25 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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,6 +17,13 @@
 
 */
 
+/** @file  test/skip_frame_test.cc
+ *  @brief Test the skip of frames by the player when putting a 48fps
+ *  source into a 24fps DCP.
+ *
+ *  @see test/repeat_frame_test.cc
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/film.h"
@@ -26,9 +33,6 @@
 
 using boost::shared_ptr;
 
-/* Test the skip of frames by the player when putting a 48fps
-   source into a 24fps DCP.
-*/
 BOOST_AUTO_TEST_CASE (skip_frame_test)
 {
 	shared_ptr<Film> film = new_test_film ("skip_frame_test");
@@ -36,10 +40,11 @@ BOOST_AUTO_TEST_CASE (skip_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/count300bd48.m2ts"));
-	c->set_ratio (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
+
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->write_metadata ();
 
 	film->set_video_frame_rate (24);