diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-03-26 00:09:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-03-26 00:09:15 +0100 |
| commit | b9c5e3f74550917676e14324791d6ba4d0c07cac (patch) | |
| tree | 4e3264a68c365af195f682b548186f6c973246b7 /src/types.cc | |
| parent | c7208194515e93f85441c76d78d11a47d79b36e1 (diff) | |
Write MCA tags based on the specified sound field.
I had previously assumed that one should write MCA information into
the sound MXF based on what channels actually contain sound rather
than silence.
However a previous example of a stereo DCP gives a verification error
in EasyDCP (see DoM bug #1935) which is solved by adding MCA tags
for each channel in the specified sound field (e.g. at least 6 tags
for a file which is marked as 5.1) even if the audio is really stereo.
This commit removes the "active channels" stuff and makes sure
that if we say a file is 5.1 we write at least 6 MCA tags (and
similarly for 7.1).
Diffstat (limited to 'src/types.cc')
| -rw-r--r-- | src/types.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/types.cc b/src/types.cc index b4c10ddc..44422ca9 100644 --- a/src/types.cc +++ b/src/types.cc @@ -827,20 +827,20 @@ dcp::channel_to_mca_universal_label (Channel c, MCASoundField field, ASDCP::Dict vector<dcp::Channel> dcp::used_audio_channels () { - vector<Channel> c; - c.push_back (Channel::LEFT); - c.push_back (Channel::RIGHT); - c.push_back (Channel::CENTRE); - c.push_back (Channel::LFE); - c.push_back (Channel::LS); - c.push_back (Channel::RS); - c.push_back (Channel::HI); - c.push_back (Channel::VI); - c.push_back (Channel::BSL); - c.push_back (Channel::BSR); - c.push_back (Channel::MOTION_DATA); - c.push_back (Channel::SYNC_SIGNAL); - c.push_back (Channel::SIGN_LANGUAGE); - return c; + return { + Channel::LEFT, + Channel::RIGHT, + Channel::CENTRE, + Channel::LFE, + Channel::LS, + Channel::RS, + Channel::HI, + Channel::VI, + Channel::BSL, + Channel::BSR, + Channel::MOTION_DATA, + Channel::SYNC_SIGNAL, + Channel::SIGN_LANGUAGE + }; } |