X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=fa5b33bb921feb348e4a0d6ad83fda54c40411b7;hb=74fe68e5895654e27a7cf8097917c1e95fa89519;hp=ee9ac0d9817c6f2fd7e19fca65d3bccf9f92c0b0;hpb=0b1f3a5dc3069726e61670b1aa35e62ba96ed198;p=dcpomatic.git

diff --git a/test/4k_test.cc b/test/4k_test.cc
index ee9ac0d98..fa5b33bb9 100644
--- a/test/4k_test.cc
+++ b/test/4k_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,12 @@
 
 */
 
+/** @file  test/4k_test.cc
+ *  @brief Run a 4K encode from a simple input.
+ *
+ *  The output is checked against test/data/4k_test.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
@@ -31,9 +37,9 @@ BOOST_AUTO_TEST_CASE (fourk_test)
 	shared_ptr<Film> film = new_test_film ("4k_test");
 	film->set_name ("4k_test");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_ratio (Ratio::from_id ("185"));
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->set_resolution (RESOLUTION_4K);
-	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 	wait_for_jobs ();