Account for split branch in libdcp.

[dcpomatic.git] / test / srt_subtitle_test.cc

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 9354628678742c259606a5594f0f9701aaf0cd69..702d0bbb63d977bc4cbac8c65957dc90a614e51b 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -32,8 +32,8 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "test.h"
-#include <dcp/smpte_subtitle_asset.h>
-#include <dcp/subtitle_string.h>
+#include <dcp/smpte_text_asset.h>
+#include <dcp/text_string.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 #include <list>
@@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
        film->set_name ("frobozz");
        film->set_audio_channels (6);
        film->set_interop (false);
+       film->set_audio_channels(16);
        auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -101,8 +102,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
 
-       /* Should be blank video with a subtitle MXF */
-       check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
+       /* Should be blank video with a subtitle MXF; sound is irrelevant */
+       check_dcp("test/data/srt_subtitle_test2", film->dir(film->dcp_name()), true);
 }
 
 
@@ -158,8 +159,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
 
-       /* Should be blank video with MXF subtitles */
-       check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
+       /* Should be blank video with MXF subtitles; sound is irrelevant */
+       check_dcp("test/data/xml_subtitle_test", film->dir(film->dcp_name()), true);
 }
 
 
@@ -172,6 +173,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
        film->set_name ("frobozz");
        film->set_interop (true);
        film->set_sequence (false);
+       film->set_audio_channels(6);
        for (auto i = 0; i < 2; ++i) {
                auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
                content->only_text()->set_use (true);
@@ -203,7 +205,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                });
 
-       check_dcp ("test/data/srt_subtitle_test6", film->dir(film->dcp_name()));
+       /* This test is concerned with the subtitles, so we'll ignore any
+        * differences in sound between the DCP and the reference to avoid test
+        * failures for unrelated reasons.
+        */
+       check_dcp("test/data/srt_subtitle_test6", film->dir(film->dcp_name()), true);
 }
 
 
@@ -231,12 +237,12 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                });
 
-       dcp::SMPTESubtitleAsset check(dcp_file(film, "sub_"));
-       auto subs = check.subtitles();
+       dcp::SMPTETextAsset check(dcp_file(film, "sub_"));
+       auto subs = check.texts();
        BOOST_REQUIRE_EQUAL(subs.size(), 1U);
-       auto sub = std::dynamic_pointer_cast<const dcp::SubtitleString>(subs[0]);
+       auto sub = std::dynamic_pointer_cast<const dcp::TextString>(subs[0]);
        BOOST_REQUIRE(sub);
-       /* libdcp::SubtitleAsset gets the text from the XML with get_content(), which
+       /* dcp::TextAsset gets the text from the XML with get_content(), which
         * resolves the 5 predefined entities & " < > ' so we shouldn't see any
         * entity here.
         */
@@ -248,6 +254,30 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
 }
 
 
+/** A control code in a .srt file should not make it into the XML */
+BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
+{
+       std::ofstream srt("build/test/srt_subtitle_control_code.srt");
+       srt << "1\n";
+       srt << "00:00:01,000 -> 00:00:10,000\n";
+       srt << "Hello \x0c world\n";
+       srt.close();
+
+       auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_control_code.srt");
+       auto film = new_test_film2("srt_subtitle_control_code", { content });
+       film->set_interop(false);
+       content->only_text()->set_use(true);
+       content->only_text()->set_burn(false);
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+                       dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+                       dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+               });
+}
+
+
 #if 0
 /* XXX: this is disabled; there is some difference in font rendering
    between the test machine and others.