projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Various playlist editor developments and fixes.
[dcpomatic.git] / test / isdcf_name_test.cc
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 52a1cd29a53b51352c024cda21cb6acaa55495fa..3315833b066aacef969af863a013163cfe97a161 100644 (file)
--- 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(), 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";
@@ -88,9 +94,9 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 
        /* Test interior aspect ratio: shouldn't be shown with trailers */
 
-       shared_ptr<ImageContent> content (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
+       shared_ptr<ImageContent> 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_MOS_4K_DI_20140704_PP_SMPTE_OV");
@@ -149,9 +155,9 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        /* Test audio channel markup */
 
        film->set_audio_channels (6);
-       shared_ptr<FFmpegContent> sound (new FFmpegContent (film, "test/data/sine_440.wav"));
+       shared_ptr<FFmpegContent> 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 ();
@@ -174,11 +180,42 @@ 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::LC, 1.0);
+       mapping.set (0, dcp::RC, 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");
+
+       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);
+       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");
 }
2.0 development branch of dcpomatic