X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=a77d8459bb317252ae1bba9295c8824f6d87e298;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=4420475942bfe4819220100130477a31cc0b8416;hpb=7d67f4a38bf7de1b901facf5390a730d307de671;p=dcpomatic.git

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 442047594..a77d8459b 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-2014 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,7 +40,7 @@ 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"));
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
@@ -46,7 +50,6 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	std::cout << film->dir (film->dcp_name ()) << "\n";
 	check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
 }