From 5e5a45917066e23be7ab8237c8dd63b21a69784e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Jun 2023 23:54:42 +0200 Subject: Don't write MainSoundConfiguration with 71 when we only have HI/VI (#2580). --- src/lib/writer.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index d42b23478..9e998a830 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -29,6 +29,7 @@ #include "dcp_video.h" #include "dcpomatic_log.h" #include "film.h" +#include "film_util.h" #include "job.h" #include "log.h" #include "ratio.h" @@ -646,10 +647,10 @@ Writer::finish (boost::filesystem::path output_dcp) } dcp::MCASoundField field; - if (film()->audio_channels() <= 6) { - field = dcp::MCASoundField::FIVE_POINT_ONE; - } else { + if (channel_is_mapped(film(), dcp::Channel::BSL) || channel_is_mapped(film(), dcp::Channel::BSR)) { field = dcp::MCASoundField::SEVEN_POINT_ONE; + } else { + field = dcp::MCASoundField::FIVE_POINT_ONE; } dcp::MainSoundConfiguration msc(field, MAX_DCP_AUDIO_CHANNELS); -- cgit v1.2.3