X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fskip_frame_test.cc;h=aea389ce301f735c3849e6bd212b8a3e34d973ba;hp=a77d8459bb317252ae1bba9295c8824f6d87e298;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=e80e6a8567dd107f5ea3b708975cb5fd92112a57

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index a77d8459b..aea389ce3 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,25 +1,27 @@
 /*
-    Copyright (C) 2013-2014 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
+    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
  */
@@ -30,6 +32,7 @@
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 
 using boost::shared_ptr;
 
@@ -38,18 +41,21 @@ 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"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	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());
+
 	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.
+	*/
 	check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
 }
-