ISDCF name fixes with > 6 channels and HI/VI (#1633).

[dcpomatic.git] / test / isdcf_name_test.cc

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 8181ffc4307d3b3de439d5181d6f99b2df25bfe8..3315833b066aacef969af863a013163cfe97a161 100644 (file)
--- 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");
 }