diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-27 11:57:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-27 11:57:15 +0100 |
| commit | 1f7f758273eb3c98356438da897b7709f8cb87f0 (patch) | |
| tree | 06fb17aa8ee01c91779402f1abb3c5d2a389ed7a /test | |
| parent | 350c6ca06fd782917586d039850c93f8f9613707 (diff) | |
Distinguish master DoM encode threads count from the server count.
Diffstat (limited to 'test')
| -rw-r--r-- | test/digest_test.cc | 4 | ||||
| -rw-r--r-- | test/test.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/digest_test.cc b/test/digest_test.cc index b96cb7ad7..ce3edb95e 100644 --- a/test/digest_test.cc +++ b/test/digest_test.cc @@ -72,10 +72,10 @@ BOOST_AUTO_TEST_CASE (digest_test) film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); wait_for_jobs (); - Config::instance()->set_num_local_encoding_threads (4); + Config::instance()->set_master_encoding_threads (4); film->make_dcp (); wait_for_jobs (); - Config::instance()->set_num_local_encoding_threads (1); + Config::instance()->set_master_encoding_threads (1); dcp::DCP dcp (film->dir (film->dcp_name ())); dcp.read (); diff --git a/test/test.cc b/test/test.cc index 3858dff11..b8d7070f8 100644 --- a/test/test.cc +++ b/test/test.cc @@ -72,7 +72,8 @@ struct TestConfig { dcpomatic_setup (); - Config::instance()->set_num_local_encoding_threads (1); + Config::instance()->set_master_encoding_threads (1); + Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); Config::instance()->set_default_container (Ratio::from_id ("185")); |