summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-05-09 22:03:01 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-29 10:35:55 +0200
commit98a0aa443e10d1db466c575fd854bef841988534 (patch)
treeb46cf722c3e538eabb36e0fe53632a6d64b19400 /test
parent099599250ecd4fbceaeee2041fff10540be7533d (diff)
Remove default DCP audio channel setting.
Diffstat (limited to 'test')
m---------test/data0
-rw-r--r--test/test.cc1
-rw-r--r--test/vf_test.cc2
3 files changed, 2 insertions, 1 deletions
diff --git a/test/data b/test/data
-Subproject d511a06d5124f7d688b5fed8445c53c2fe08e5b
+Subproject a70f9301976da3137b61d217ccdc13ee8c615a5
diff --git a/test/test.cc b/test/test.cc
index c145a8b4d..f81db8f91 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -124,7 +124,6 @@ setup_test_config ()
Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
Config::instance()->set_default_interop (false);
Config::instance()->set_default_still_length (10);
- Config::instance()->set_default_dcp_audio_channels(8);
Config::instance()->set_log_types (
LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |
LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 72c5ececf..589e12d83 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -515,6 +515,7 @@ BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name)
{
auto subs = content_factory("test/data/short.srt")[0];
auto ov = new_test_film("ov_subs_in_vf_name_ov", { subs });
+ ov->set_audio_channels(8);
subs->only_text()->set_language(dcp::LanguageTag("de"));
make_and_verify_dcp(
ov,
@@ -526,6 +527,7 @@ BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name)
auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
auto vf = new_test_film("ov_subs_in_vf_name_vf", { ov_dcp });
vf->set_name("foo");
+ vf->set_audio_channels(8);
ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true);
vf->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18);