diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-01-15 21:49:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-01-15 22:38:40 +0100 |
| commit | 4646b9978c75eba5228d53bff8af1804edac7338 (patch) | |
| tree | 7f6f7a96a16efffda58730415fae27efdd440b67 | |
| parent | d361b99f8dc8b9b1bcde40e0056e3fc796e5583c (diff) | |
Use MCASoundField::STEREO (20) for stereo DCPs.2419-main-sound-configuration
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/writer.cc | 15 |
2 files changed, 10 insertions, 7 deletions
@@ -457,7 +457,7 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.50')) + deps.append(('libdcp', '9e21471d452b05073d6bb7729f86365a2647cc94')) deps.append(('libsub', 'v1.6.42')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 2e732c280..f7665a7a7 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -657,14 +657,17 @@ Writer::finish (boost::filesystem::path output_dcp) cpl->set_sign_language_video_language (*film()->sign_language_video_language()); } - auto ac = film()->mapped_audio_channels(); - dcp::MCASoundField field = ( - find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSL)) != ac.end() || - find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSR)) != ac.end() - ) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE; + dcp::MCASoundField field; + if (film()->audio_channels() == 2) { + field = dcp::MCASoundField::STEREO; + } else if (film()->audio_channels() <= 6) { + field = dcp::MCASoundField::FIVE_POINT_ONE; + } else { + field = dcp::MCASoundField::SEVEN_POINT_ONE; + } dcp::MainSoundConfiguration msc (field, film()->audio_channels()); - for (auto i: ac) { + for (auto i: film()->mapped_audio_channels()) { if (static_cast<int>(i) < film()->audio_channels()) { msc.set_mapping (i, static_cast<dcp::Channel>(i)); } |