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

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index c65340e1c..bdb21bfcc 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -32,6 +32,8 @@
 #include "lib/audio_mapping.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/content_factory.h"
+#include "lib/text_content.h"
 #include "test.h"
 #include <iostream>
 
@@ -51,7 +53,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	ISDCFMetadata m;
 	m.content_version = 1;
 	m.audio_language = "EN";
-	m.subtitle_language = "XX";
 	m.territory = "UK";
 	m.rating = "PG";
 	m.studio = "ST";
@@ -68,9 +69,14 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
 	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(), 1U);
+	text->text.front()->set_language ("fr");
+	text->text.front()->set_burn (true);
+	film->examine_and_add_content (text);
+	BOOST_REQUIRE (!wait_for_jobs());
 	m.content_version = 2;
 	m.audio_language = "DE";
-	m.subtitle_language = "FR";
 	m.territory = "US";
 	m.rating = "R";
 	m.studio = "DI";
@@ -91,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");
 
@@ -102,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 */
 
@@ -174,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");
 }