summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-06-30 23:54:42 +0200
committerCarl Hetherington <cth@carlh.net>2023-06-30 23:54:42 +0200
commit5e5a45917066e23be7ab8237c8dd63b21a69784e (patch)
tree280d4ae5835f099c29112747215f51d65d3a59ba /src/lib
parent71acc01a622ce33abb18f541925e8ec42c834859 (diff)
Don't write MainSoundConfiguration with 71 when we only have HI/VI (#2580).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/writer.cc7
1 files changed, 4 insertions, 3 deletions
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);