diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-18 17:48:13 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-18 17:49:51 +0200 |
| commit | a2cba59a791eb8a65d730aa170586117f120e437 (patch) | |
| tree | 7cd754392485ccd24d5b8db803cb7a3131a91150 /test | |
| parent | 392d675f5799671abbcf1a9a47820321bcbdcca2 (diff) | |
ISDCF name fixes with > 6 channels and HI/VI (#1633).
Diffstat (limited to 'test')
| -rw-r--r-- | test/isdcf_name_test.cc | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 8181ffc43..3315833b0 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -180,11 +180,42 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) mapping.set (0, dcp::HI, 1.0); sound->audio->set_mapping (mapping); BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PP_SMPTE_OV"); + film->set_audio_channels (8); mapping.set (0, dcp::HI, 1.0); sound->audio->set_mapping (mapping); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_61_4K_DI_20140704_PP_SMPTE_OV"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI_4K_DI_20140704_PP_SMPTE_OV"); mapping.set (0, dcp::VI, 1.0); sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PP_SMPTE_OV"); + + film->set_audio_channels(10); + mapping.set (0, dcp::LC, 1.0); + mapping.set (0, dcp::RC, 1.0); + mapping.set (0, dcp::HI, 0.0); + mapping.set (0, dcp::VI, 0.0); + sound->audio->set_mapping (mapping); BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71_4K_DI_20140704_PP_SMPTE_OV"); + mapping.set (0, dcp::HI, 1.0); + sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI_4K_DI_20140704_PP_SMPTE_OV"); + mapping.set (0, dcp::VI, 1.0); + sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PP_SMPTE_OV"); + + film->set_audio_channels(12); + mapping.set (0, dcp::LC, 0.0); + mapping.set (0, dcp::RC, 0.0); + mapping.set (0, dcp::BSL, 1.0); + mapping.set (0, dcp::BSR, 1.0); + mapping.set (0, dcp::HI, 0.0); + mapping.set (0, dcp::VI, 0.0); + sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71_4K_DI_20140704_PP_SMPTE_OV"); + mapping.set (0, dcp::HI, 1.0); + sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI_4K_DI_20140704_PP_SMPTE_OV"); + mapping.set (0, dcp::VI, 1.0); + sound->audio->set_mapping (mapping); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PP_SMPTE_OV"); } |