diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-11 09:19:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-11 09:19:09 +0100 |
| commit | fc47a8d1e5b97214358b8cb828b4503ecab949ac (patch) | |
| tree | 6b37b4692578111ee017055a54dc32b9ff551f9a /test/isdcf_name_test.cc | |
| parent | f0cc79a6c34b8198155f6e519d4464385ea30049 (diff) | |
Don't specify internal aspect ratio in the ISDCF name for trailers, as per
http://digitalcinemanamingconvention.com/appendix_7.asp
Reported-by: Ivan Pullman
Diffstat (limited to 'test/isdcf_name_test.cc')
| -rw-r--r-- | test/isdcf_name_test.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 65f89c0f4..dd1b64162 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -70,19 +70,24 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_interop (false); BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF"); - /* Test interior aspect ratio */ + /* Test interior aspect ratio: shouldn't be shown with trailers */ shared_ptr<ImageContent> content (new ImageContent (film, "test/data/simple_testcard_640x480.png")); film->examine_and_add_content (content); wait_for_jobs (); content->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-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_F_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF"); + /* 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_10_4K_DI_20140704_PP_SMPTE_VF"); + /* Test 3D */ film->set_three_d (true); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2-3D_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE-3D_VF"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-3D_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE-3D_VF"); /* Test content type modifiers */ @@ -95,6 +100,6 @@ 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_TLR-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2-Temp-Pre-RedBand-MyChain-2D-4fl-48_F-133_DE-FR_US-R_10_4K_DI_20140704_PP_SMPTE_VF"); } |