/*
- Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
/** @file test/isdcf_name_test.cc
* @brief Test creation of ISDCF names.
- * @ingroup specific
+ * @ingroup feature
*/
+
#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/ratio.h"
#include "test.h"
#include <iostream>
+
using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
BOOST_AUTO_TEST_CASE (isdcf_name_test)
{
- shared_ptr<Film> film = new_test_film ("isdcf_name_test");
+ auto film = new_test_film ("isdcf_name_test");
/* A basic test */
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
film->set_container (Ratio::from_id ("185"));
film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
- ISDCFMetadata m;
- m.content_version = 1;
- m.audio_language = "EN";
- m.territory = "UK";
- m.rating = "PG";
- m.studio = "ST";
- m.facility = "FA";
- film->set_isdcf_metadata (m);
+ auto audio = content_factory("test/data/sine_440.wav").front();
+ film->examine_and_add_content (audio);
+ BOOST_REQUIRE (!wait_for_jobs());
+ BOOST_REQUIRE (audio->audio);
+ audio->audio->set_language(dcp::LanguageTag("en-US"));
+ film->set_content_versions({"1"});
+ film->set_release_territory(dcp::LanguageTag::RegionSubtag("GB"));
+ film->set_ratings({dcp::Rating("BBFC", "PG")});
+ film->set_studio (string("ST"));
+ film->set_facility (string("FAC"));
film->set_interop (true);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_GB-PG_10_2K_ST_20140704_FAC_IOP_OV");
+
+ /* Check that specifying no audio language writes XX */
+ audio->audio->set_language (boost::none);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_XX-XX_GB-PG_10_2K_ST_20140704_FAC_IOP_OV");
/* Test a long name and some different data */
film->set_container (Ratio::from_id ("239"));
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(), 1);
- text->text.front()->set_language ("fr");
+ film->set_resolution (Resolution::FOUR_K);
+ auto text = content_factory("test/data/subrip.srt").front();
+ BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
text->text.front()->set_burn (true);
+ text->text.front()->set_language (dcp::LanguageTag("fr-FR"));
film->examine_and_add_content (text);
+ film->set_version_number(2);
+ film->set_release_territory(dcp::LanguageTag::RegionSubtag("US"));
+ film->set_ratings({dcp::Rating("MPA", "R")});
+ film->set_studio (string("di"));
+ film->set_facility (string("ppfacility"));
BOOST_REQUIRE (!wait_for_jobs());
- m.content_version = 2;
- m.audio_language = "DE";
- m.territory = "US";
- m.rating = "R";
- m.studio = "DI";
- m.facility = "PP";
- film->set_isdcf_metadata (m);
+ audio = content_factory("test/data/sine_440.wav").front();
+ film->examine_and_add_content (audio);
+ BOOST_REQUIRE (!wait_for_jobs());
+ BOOST_REQUIRE (audio->audio);
+ audio->audio->set_language (dcp::LanguageTag("de-DE"));
film->set_interop (false);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* Test to see that RU ratings like 6+ survive */
- m.rating = "6+";
- film->set_isdcf_metadata (m);
- BOOST_CHECK_EQUAL (film->dcp_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-6+_MOS_4K_DI_20140704_PP_SMPTE_OV");
- m.rating = "R";
- film->set_isdcf_metadata (m);
+ film->set_ratings({dcp::Rating("RARS", "6+")});
+ BOOST_CHECK_EQUAL (film->dcp_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-6+_MOS_4K_DI_20140704_PPF_SMPTE_OV");
+ film->set_ratings({dcp::Rating("MPA", "R")});
/* Test interior aspect ratio: shouldn't be shown with trailers */
BOOST_REQUIRE (!wait_for_jobs());
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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* But should be shown for anything else */
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* And it should always be numeric */
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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-239_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-190_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
content->video->set_custom_ratio (1.33);
/* Test 3D */
film->set_three_d (true);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE-3D_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE-3D_OV");
/* Test content type modifiers */
film->set_three_d (false);
- m.temp_version = true;
- m.pre_release = true;
- m.red_band = true;
- m.chain = "MyChain";
- m.two_d_version_of_three_d = true;
- m.mastered_luminance = "4fl";
- film->set_isdcf_metadata (m);
+ film->set_temp_version (true);
+ film->set_pre_release (true);
+ film->set_red_band (true);
+ film->set_two_d_version_of_three_d (true);
+ film->set_chain (string("MyChain"));
+ 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_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4.5fl-48_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* Test a name which is already in camelCase */
film->set_three_d (false);
- m.temp_version = false;
- m.pre_release = false;
- m.red_band = false;
- m.chain = "";
- m.two_d_version_of_three_d = false;
- m.mastered_luminance = "";
- film->set_isdcf_metadata (m);
+ film->set_temp_version (false);
+ film->set_pre_release (false);
+ film->set_red_band (false);
+ film->set_two_d_version_of_three_d (false);
+ film->set_chain (string(""));
+ 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_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "IKnowCamels_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* And one in capitals */
film->set_name ("LIKE SHOUTING");
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
/* Test audio channel markup */
film->set_audio_channels (6);
- shared_ptr<FFmpegContent> sound (new FFmpegContent("test/data/sine_440.wav"));
+ auto sound = make_shared<FFmpegContent>("test/data/sine_440.wav");
film->examine_and_add_content (sound);
BOOST_REQUIRE (!wait_for_jobs());
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PP_SMPTE_OV");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PPF_SMPTE_OV");
AudioMapping mapping = sound->audio->mapping ();
- mapping.set (0, dcp::LEFT, 1.0);
+ mapping.set (0, dcp::Channel::LEFT, 1.0);
sound->audio->set_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_20_4K_DI_20140704_PP_SMPTE_OV");
- mapping.set (0, dcp::RIGHT, 1.0);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_20_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::RIGHT, 1.0);
sound->audio->set_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_30_4K_DI_20140704_PP_SMPTE_OV");
- mapping.set (0, dcp::LFE, 1.0);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_30_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::LFE, 1.0);
sound->audio->set_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_31_4K_DI_20140704_PP_SMPTE_OV");
- mapping.set (0, dcp::LS, 1.0);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_31_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::LS, 1.0);
sound->audio->set_mapping (mapping);
- BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_41_4K_DI_20140704_PP_SMPTE_OV");
- mapping.set (0, dcp::RS, 1.0);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_41_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::RS, 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");
- mapping.set (0, dcp::HI, 1.0);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PPF_SMPTE_OV");
film->set_audio_channels (8);
- mapping.set (0, dcp::HI, 1.0);
+ mapping.set (0, dcp::Channel::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);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PPF_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);
+ mapping.set (0, dcp::Channel::HI, 0.0);
+ mapping.set (0, dcp::Channel::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);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_51-HI-VI_4K_DI_20140704_PPF_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);
+ mapping.set (0, dcp::Channel::BSL, 1.0);
+ mapping.set (0, dcp::Channel::BSR, 1.0);
+ mapping.set (0, dcp::Channel::HI, 0.0);
+ mapping.set (0, dcp::Channel::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);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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);
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI_4K_DI_20140704_PPF_SMPTE_OV");
+ mapping.set (0, dcp::Channel::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");
+ BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_71-HI-VI_4K_DI_20140704_PPF_SMPTE_OV");
}
+
projects / dcpomatic.git / blobdiff