X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=8181ffc4307d3b3de439d5181d6f99b2df25bfe8;hb=5728b8095b9522626d61b1c684a9492f759e2870;hp=e3023f9f5e891cb8712561cb5b5c1f4eb59e1752;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index e3023f9f5..8181ffc43 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2016 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,11 @@ */ +/** @file test/isdcf_name_test.cc + * @brief Test creation of ISDCF names. + * @ingroup specific + */ + #include #include "lib/film.h" #include "lib/ratio.h" @@ -27,13 +32,13 @@ #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 #include using std::cout; using boost::shared_ptr; -using boost::make_shared; BOOST_AUTO_TEST_CASE (isdcf_name_test) { @@ -48,14 +53,13 @@ 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"; m.facility = "FA"; film->set_isdcf_metadata (m); film->set_interop (true); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_2K_ST_20140704_FA_IOP_OV"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_MOS_2K_ST_20140704_FA_IOP_OV"); /* Test a long name and some different data */ @@ -65,35 +69,56 @@ 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 text = content_factory("test/data/subrip.srt").front(); + BOOST_REQUIRE_EQUAL (text->text.size(), 1); + 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"; m.facility = "PP"; film->set_isdcf_metadata (m); film->set_interop (false); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_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_PP_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); /* Test interior aspect ratio: shouldn't be shown with trailers */ - shared_ptr content = make_shared (film, "test/data/simple_testcard_640x480.png"); + shared_ptr content (new ImageContent ("test/data/simple_testcard_640x480.png")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); content->video->set_scale (VideoContentScale (Ratio::from_id ("133"))); film->set_container (Ratio::from_id ("185")); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-fr_US-R_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_PP_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_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_PP_SMPTE_OV"); + + /* And it should always be numeric */ + + content->video->set_scale (VideoContentScale (Ratio::from_id ("239"))); + 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"))); + 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"))); /* Test 3D */ film->set_three_d (true); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-fr_US-R_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_PP_SMPTE-3D_OV"); /* Test content type modifiers */ @@ -106,7 +131,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) m.mastered_luminance = "4fl"; film->set_isdcf_metadata (m); 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_4K_DI_20140704_PP_SMPTE_OV"); + 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"); /* Test a name which is already in camelCase */ @@ -120,19 +145,19 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_isdcf_metadata (m); 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_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_PP_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_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_PP_SMPTE_OV"); /* Test audio channel markup */ film->set_audio_channels (6); - shared_ptr sound = make_shared (film, "test/data/sine_440.wav"); + shared_ptr sound (new FFmpegContent("test/data/sine_440.wav")); film->examine_and_add_content (sound); - wait_for_jobs (); + 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"); AudioMapping mapping = sound->audio->mapping ();