Split audio; builds.

[dcpomatic.git] / test / skip_frame_test.cc

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index a77d8459bb317252ae1bba9295c8824f6d87e298..6f3e2eff4ba185881cc4bec5a4c595f7c98a79fa 100644 (file)
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,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;
 
@@ -40,16 +41,19 @@ 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_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        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 ();
 
+       /* 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 ()));
 }
-