Run one test with fewer cores to stop it running out of memory on a 16-core 16Gb...

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index cda278a59702506a654392aaf3c4d8b8897723fd..0c8632251a12743cb482ad51fb2d2220955d9eef 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,24 @@
 
 */
 
+
 /** @file  test/threed_test.cc
  *  @brief Create some 3D DCPs (without comparing the results to anything).
  *  @ingroup completedcp
  */
 
-#include "test.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
+
 #include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/video_content.h"
-#include "lib/job_manager.h"
-#include "lib/cross.h"
+#include "lib/film.h"
 #include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -102,6 +105,11 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
+       ConfigRestorer cr;
+
+       /* Try to stop out-of-memory crashes on my laptop */
+       Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 4);
+
        auto film = new_test_film2 ("threed_test4");
        auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
        film->examine_and_add_content (L);
@@ -169,12 +177,13 @@ BOOST_AUTO_TEST_CASE (threed_test7)
        using boost::filesystem::path;
 
        auto film = new_test_film2 ("threed_test7");
-       path const content_path = "test/data/red_24.mp4";
-       auto c = make_shared<FFmpegContent>(content_path);
+       path const content_path = "test/data/flat_red.png";
+       auto c = content_factory(content_path).front();
        film->examine_and_add_content (c);
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VideoFrameType::THREE_D);
+       c->video->set_length (24);
 
        film->set_three_d (true);
        film->make_dcp ();