More of previous.

7 files changed, 14 insertions, 8 deletions

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 98efe4dd0..444b0869b 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -44,10 +44,11 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
 	film->set_name ("ffmpeg_audio_test");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/staircase.mov"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	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_audio_channels (6);
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 234bf2c79..559277e51 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -38,11 +38,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	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->make_dcp ();
diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 4f66420ea..1d19d269e 100644
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -40,11 +40,12 @@ BOOST_AUTO_TEST_CASE (repeat_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/red_24.mp4"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
 
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	
 	film->set_video_frame_rate (48);
 	film->make_dcp ();
 	wait_for_jobs ();
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 441af6bf3..e37b60949 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -33,12 +33,13 @@ using boost::shared_ptr;
 
 static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
 {
-	content->set_scale (VideoContentScale (Ratio::from_id (image)));
 	film->set_container (Ratio::from_id (container));
 	film->make_dcp ();
 
 	wait_for_jobs ();
 
+	content->set_scale (VideoContentScale (Ratio::from_id (image)));
+
 	boost::filesystem::path ref;
 	ref = "test";
 	ref /= "data";
diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 682fa9355..2a1a06136 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -45,10 +45,10 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
-
+	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	
 	/* Work out the first video frame index that we will be given, taking into account
 	 * the difference between first video and first audio.
 	 */
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index a77d8459b..79be6d0f6 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -40,10 +40,11 @@ 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->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->write_metadata ();
 
 	film->set_video_frame_rate (24);
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 5ad78103f..fb021d169 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -36,11 +36,12 @@ 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_scale (VideoContentScale (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"));