diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-03 20:08:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-04 20:48:35 +0200 |
| commit | 8336cba4e6a8c594680696d2337ddc800d84c267 (patch) | |
| tree | af84a4d07479762cb89fb45798a42e3973e9b2e2 /test | |
| parent | 4b8b74ae8ae721f2fbf317f1d7ce5be6048ae1b0 (diff) | |
Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.
Diffstat (limited to 'test')
| -rw-r--r-- | test/isdcf_name_test.cc | 9 | ||||
| -rw-r--r-- | test/test.cc | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index c559e433f..325ee62f4 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -66,8 +66,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_ratings({dcp::Rating("BBFC", "PG")}); film->set_studio (string("ST")); film->set_facility (string("FAC")); - ISDCFMetadata m; - film->set_isdcf_metadata (m); film->set_interop (true); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_GB-PG_10_2K_ST_20140704_FAC_IOP_OV"); @@ -99,7 +97,6 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) BOOST_REQUIRE (!wait_for_jobs()); BOOST_REQUIRE (audio->audio); audio->audio->set_language (dcp::LanguageTag("de-DE")); - film->set_isdcf_metadata (m); film->set_interop (false); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); @@ -144,8 +141,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_red_band (true); film->set_two_d_version_of_three_d (true); film->set_chain (string("MyChain")); - m.mastered_luminance = "4fl"; - film->set_isdcf_metadata (m); + film->set_luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT)); film->set_video_frame_rate (48); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); @@ -157,8 +153,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_red_band (false); film->set_two_d_version_of_three_d (false); film->set_chain (string("")); - m.mastered_luminance = ""; - film->set_isdcf_metadata (m); + film->set_luminance (boost::none); film->set_video_frame_rate (24); film->set_name ("IKnowCamels"); BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV"); diff --git a/test/test.cc b/test/test.cc index 8cbb2408b..ed8a93135 100644 --- a/test/test.cc +++ b/test/test.cc @@ -105,7 +105,6 @@ setup_test_config () Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency()); Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); - Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); Config::instance()->set_default_container (Ratio::from_id ("185")); Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0)); Config::instance()->set_default_audio_delay (0); |