diff options
| -rw-r--r-- | test/test.cc | 2 | ||||
| -rw-r--r-- | test/threed_test.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/test.cc b/test/test.cc index fc5d9dc83..466d6bb31 100644 --- a/test/test.cc +++ b/test/test.cc @@ -117,7 +117,7 @@ boost::filesystem::path TestPaths::xsd () static void setup_test_config () { - Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2); + Config::instance()->set_master_encoding_threads(boost::thread::hardware_concurrency()); Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0)); diff --git a/test/threed_test.cc b/test/threed_test.cc index 78d74add4..408cf3178 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -115,9 +115,6 @@ 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); |