Default to writing 8 audio channels in DCPs (#2443).

It seems likely that 8 channels is slightly less likely to trip validation
warnings from some distributors, and so it seems worth accepting the potential
waste of 2 channels.  Users can always set this back to 6 again (once,
and it will be saved) and those upgrading from old versions won't be affected
anyway.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 3366a2bbc018015ca119fee015aa3f0134747329..fdce7510995947886af1d80a030c28594db65fbd 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -106,7 +106,7 @@ Config::set_defaults ()
        _language = optional<string> ();
        _default_still_length = 10;
        _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
-       _default_dcp_audio_channels = 6;
+       _default_dcp_audio_channels = 8;
        _default_j2k_bandwidth = 150000000;
        _default_audio_delay = 0;
        _default_interop = false;

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index ada943c804bf0beb0ae461cb2440d6194f9c4e6c..878e6025422208c851e530953c41dc090d7b1925 100644 (file)
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -63,6 +63,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
        film->set_distributor (string(""));
        film->set_facility (string(""));
        film->set_release_territory (dcp::LanguageTag::RegionSubtag("US"));
+       film->set_audio_channels(6);
        film->write_metadata ();
 
        list<string> ignore = { "Key", "ContextID", "LastWrittenBy" };