X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=1e728bc9b29111eb4d0243c2411b4f1683e5aedc;hb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;hp=5ad78103fb98d05c40cdf4e2477c29556cc17757;hpb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;p=dcpomatic.git diff --git a/test/threed_test.cc b/test/threed_test.cc index 5ad78103f..1e728bc9b 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 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,8 @@ #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" +#include "lib/video_content.h" +#include using std::cout; using boost::shared_ptr; @@ -36,12 +38,13 @@ BOOST_AUTO_TEST_CASE (threed_test) shared_ptr film = new_test_film ("threed_test"); film->set_name ("test_film2"); shared_ptr c (new FFmpegContent (film, "test/data/test.mp4")); - c->set_scale (VideoContentScale (Ratio::from_id ("185"))); - c->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); + c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); film->examine_and_add_content (c); wait_for_jobs (); - + + c->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); film->set_three_d (true);