X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=aea389ce301f735c3849e6bd212b8a3e34d973ba;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hp=6f3e2eff4ba185881cc4bec5a4c595f7c98a79fa;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 6f3e2eff4..aea389ce3 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,25 +1,27 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @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 specific
  *
  *  @see test/repeat_frame_test.cc
  */
@@ -39,18 +41,18 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
 	shared_ptr<Film> 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 (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+	film->set_interop (false);
+	shared_ptr<FFmpegContent> c (new 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 ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Should be white numbers on a black background counting up from 2 in steps of 2
 	   up to 300.