X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=bdb21bfccc42a034b2be7035c842d4fa2643c311;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hp=8181ffc4307d3b3de439d5181d6f99b2df25bfe8;hpb=698e3ac8863d264237003b49750ae074d612f451;p=dcpomatic.git

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 8181ffc43..bdb21bfcc 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_audio_channels (1);
 	film->set_resolution (RESOLUTION_4K);
 	shared_ptr<Content> text = content_factory("test/data/subrip.srt").front();
-	BOOST_REQUIRE_EQUAL (text->text.size(), 1);
+	BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
 	text->text.front()->set_language ("fr");
 	text->text.front()->set_burn (true);
 	film->examine_and_add_content (text);
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	shared_ptr<ImageContent> content (new ImageContent ("test/data/simple_testcard_640x480.png"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
+	content->video->set_custom_ratio (1.33);
 	film->set_container (Ratio::from_id ("185"));
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
 
@@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 
 	/* And it should always be numeric */
 
-	content->video->set_scale (VideoContentScale (Ratio::from_id ("239")));
+	content->video->set_custom_ratio (2.39);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-239_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
 
-	content->video->set_scale (VideoContentScale (Ratio::from_id ("190")));
+	content->video->set_custom_ratio (1.9);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-190_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
-	content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
+	content->video->set_custom_ratio (1.33);
 
 	/* Test 3D */
 
@@ -180,11 +180,38 @@ 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::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_51_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_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(12);
+	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");
 }