More of previous.

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 98efe4dd0769ea62aae9e4550fdd41af43349311..444b0869b7dc52fd2928dec6444a408315265642 100644 (file)
--- 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 234bf2c79b10bd8dafc5e74f71d2a36c98c22d3e..559277e511a4ba14e59f4f2b329eea6d4b77224b 100644 (file)
--- 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 4f66420ea4bedbeafd58439ca5d5f5d5987d453c..1d19d269e314b2a448ab31dbbfcf73ceea9eaf1c 100644 (file)
--- 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 441af6bf30514ecb2eaaafa58ae7deea3ffdaa16..e37b609495d2a9f085643e762dd94a5b477aef07 100644 (file)
--- 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 682fa93555742461f93f556cd714231685c51c23..2a1a061360e328fefc6721aeb09f1c9d3b7fedbc 100644 (file)
--- 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 a77d8459bb317252ae1bba9295c8824f6d87e298..79be6d0f6f709af5a7f43982ef7d60b60f59a7ef 100644 (file)
--- 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 5ad78103fb98d05c40cdf4e2477c29556cc17757..fb021d169c033422ad35a856950e1119b28ee03f 100644 (file)
--- 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"));