summaryrefslogtreecommitdiff
path: root/test/mca_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-03-26 00:09:15 +0100
committerCarl Hetherington <cth@carlh.net>2021-03-26 00:09:15 +0100
commitb9c5e3f74550917676e14324791d6ba4d0c07cac (patch)
tree4e3264a68c365af195f682b548186f6c973246b7 /test/mca_test.cc
parentc7208194515e93f85441c76d78d11a47d79b36e1 (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 'test/mca_test.cc')
-rw-r--r--test/mca_test.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/test/mca_test.cc b/test/mca_test.cc
index 8467b49a..d9708ea9 100644
--- a/test/mca_test.cc
+++ b/test/mca_test.cc
@@ -92,14 +92,7 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test)
BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test)
{
shared_ptr<dcp::SoundAsset> sound_asset(new dcp::SoundAsset(dcp::Fraction(24, 1), 48000, 6, dcp::LanguageTag("en-US"), dcp::Standard::SMPTE));
- vector<dcp::Channel> channels;
- channels.push_back (dcp::Channel::LEFT);
- channels.push_back (dcp::Channel::RIGHT);
- channels.push_back (dcp::Channel::CENTRE);
- channels.push_back (dcp::Channel::LFE);
- channels.push_back (dcp::Channel::LS);
- channels.push_back (dcp::Channel::RS);
- shared_ptr<dcp::SoundAssetWriter> writer = sound_asset->start_write("build/test/write_mca_descriptors_to_mxf_test.mxf", channels);
+ shared_ptr<dcp::SoundAssetWriter> writer = sound_asset->start_write("build/test/write_mca_descriptors_to_mxf_test.mxf");
float* samples[6];
for (int i = 0; i < 6; ++i) {