X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=d71ad5b77460dc91855b827ab605bc96489951b4;hb=c674598c4366d475b6356e2f56c112a36b0c472e;hp=31a95e38278d36c8d79c58a9a372147cbe2f4dda;hpb=38fda7888663429d452b9c71902e8bb5239dd720;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 31a95e382..d71ad5b77 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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,12 +17,17 @@
 
 */
 
+/** @file  test/threed_test.cc
+ *  @brief Create a 3D DCP (without comparing the result to anything).
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
+#include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
@@ -32,12 +37,13 @@ BOOST_AUTO_TEST_CASE (threed_test)
 	shared_ptr<Film> film = new_test_film ("threed_test");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_ratio (Ratio::from_id ("185"));
 	c->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
-	
+
+	c->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);