diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:57:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-16 14:57:06 +0200 |
| commit | a4930f8185f2d3f3a9dc93b938792fae758be4d7 (patch) | |
| tree | f3813d7b4be91718edfc73ad45aba46447b3e99c /test | |
| parent | 9b9af8a80860210c6a29446f7a24795eeda9e7bc (diff) | |
| parent | 47b82590f5d1538b599e323daa5e0c792e4d4695 (diff) | |
Merge branch 'main' into v1.9.xv1.9.7
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_metadata_test.cc | 24 | ||||
| -rw-r--r-- | test/stream_operators.cc | 6 |
2 files changed, 30 insertions, 0 deletions
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc index a811e56f..906f1bc4 100644 --- a/test/cpl_metadata_test.cc +++ b/test/cpl_metadata_test.cc @@ -154,6 +154,30 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test5) } +BOOST_AUTO_TEST_CASE(main_sound_configuration_test6) +{ + dcp::MainSoundConfiguration msc("WTF/L,R,C,LFE,LsLss,RsRss,HI,VIN,Lc,Rc,Lrs,Rrs,Mtn,FSKSync,SLVS,-"); + BOOST_CHECK_EQUAL(msc.channels(), 16); + BOOST_CHECK_EQUAL(msc.field(), dcp::MCASoundField::OTHER); + BOOST_CHECK_EQUAL(msc.mapping(0).get(), dcp::Channel::LEFT); + BOOST_CHECK_EQUAL(msc.mapping(1).get(), dcp::Channel::RIGHT); + BOOST_CHECK_EQUAL(msc.mapping(2).get(), dcp::Channel::CENTRE); + BOOST_CHECK_EQUAL(msc.mapping(3).get(), dcp::Channel::LFE); + BOOST_CHECK_EQUAL(msc.mapping(4).get(), dcp::Channel::LS); + BOOST_CHECK_EQUAL(msc.mapping(5).get(), dcp::Channel::RS); + BOOST_CHECK_EQUAL(msc.mapping(6).get(), dcp::Channel::HI); + BOOST_CHECK_EQUAL(msc.mapping(7).get(), dcp::Channel::VI); + BOOST_CHECK_EQUAL(msc.mapping(8).get(), dcp::Channel::LC); + BOOST_CHECK_EQUAL(msc.mapping(9).get(), dcp::Channel::RC); + BOOST_CHECK_EQUAL(msc.mapping(10).get(), dcp::Channel::BSL); + BOOST_CHECK_EQUAL(msc.mapping(11).get(), dcp::Channel::BSR); + BOOST_CHECK_EQUAL(msc.mapping(12).get(), dcp::Channel::MOTION_DATA); + BOOST_CHECK_EQUAL(msc.mapping(13).get(), dcp::Channel::SYNC_SIGNAL); + BOOST_CHECK_EQUAL(msc.mapping(14).get(), dcp::Channel::SIGN_LANGUAGE); + BOOST_CHECK(!msc.mapping(15)); +} + + /* 482-12 says that implementations may use case-insensitive comparisons for the channel identifiers, * and there is one DCP in the private test suite (made by Disney) that uses LS for left surround. */ diff --git a/test/stream_operators.cc b/test/stream_operators.cc index 4895076a..348abd2f 100644 --- a/test/stream_operators.cc +++ b/test/stream_operators.cc @@ -130,6 +130,12 @@ dcp::operator<<(ostream& s, Channel c) case Channel::VI: s << "vi(7)"; break; + case Channel::LC: + s << "lc(8)"; + break; + case Channel::RC: + s << "rc(9)"; + break; case Channel::BSL: s << "bsl(10)"; break; |