X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=db6e4f62f45e934ac5317b6eb2035ee397a40572;hb=e39cf78842eb33fac1deaf095c549ce857743b74;hp=fa5b33bb921feb348e4a0d6ad83fda54c40411b7;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git diff --git a/test/4k_test.cc b/test/4k_test.cc index fa5b33bb9..db6e4f62f 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington 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 @@ -27,6 +27,7 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/dcp_content_type.h" +#include "lib/video_content.h" #include "lib/ratio.h" #include "test.h" @@ -37,13 +38,14 @@ BOOST_AUTO_TEST_CASE (fourk_test) shared_ptr film = new_test_film ("4k_test"); film->set_name ("4k_test"); shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->set_resolution (RESOLUTION_4K); 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 (); + c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + film->make_dcp (); wait_for_jobs ();