Don't give a verification error if there are closed caption tracks with different...

[libdcp.git] / test / verify_test.cc

diff --git a/test/verify_test.cc b/test/verify_test.cc
index f5a012a629f93ccd55ad26142640ccd851b3bbb8..4312194126452a2a0a632a3e15d8f55d142b7ee6 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -53,6 +53,7 @@
 #include "test.h"
 #include "util.h"
 #include "verify.h"
+#include "verify_j2k.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 #include <cstdio>
@@ -1322,7 +1323,48 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
                { path },
                {
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
-                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") },
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISMATCHED_SUBTITLE_LANGUAGES }
+               });
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
+{
+       path path ("build/test/verify_multiple_closed_caption_languages_allowed");
+       auto dcp = make_simple (path, 2, 240);
+       auto cpl = dcp->cpls()[0];
+
+       {
+               auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
+               ccaps->set_language (dcp::LanguageTag("de-DE"));
+               ccaps->add (simple_subtitle());
+               ccaps->write (path / "subs1.mxf");
+               auto reel_ccaps = make_shared<dcp::ReelClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), 240, 0);
+               cpl->reels()[0]->add(reel_ccaps);
+       }
+
+       {
+               auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
+               ccaps->set_language (dcp::LanguageTag("en-US"));
+               ccaps->add (simple_subtitle());
+               ccaps->write (path / "subs2.mxf");
+               auto reel_ccaps = make_shared<dcp::ReelClosedCaptionAsset>(ccaps, dcp::Fraction(24, 1), 240, 0);
+               cpl->reels()[1]->add(reel_ccaps);
+       }
+
+       dcp->write_xml (
+               dcp::Standard::SMPTE,
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::String::compose("libdcp %1", dcp::version),
+               dcp::LocalTime().as_string(),
+               "A Test DCP"
+               );
+
+       check_verify_result (
+               { path },
+               {
+                       { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs1.mxf") },
                        { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(path / "subs2.mxf") }
                });
 }
@@ -2728,3 +2770,40 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
        check_verify_result ({dir}, {{dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED}});
 }
 
+
+BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_2k)
+{
+       vector<dcp::VerificationNote> notes;
+       dcp::MonoPictureAsset picture (find_file(private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV", "j2c.mxf"));
+       auto reader = picture.start_read ();
+       auto frame = reader->get_frame (0);
+       verify_j2k (frame, notes);
+       dump_notes (notes);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_4k)
+{
+       vector<dcp::VerificationNote> notes;
+       dcp::MonoPictureAsset picture (find_file(private_test / "data" / "sul", "TLR"));
+       auto reader = picture.start_read ();
+       auto frame = reader->get_frame (0);
+       verify_j2k (frame, notes);
+       dump_notes (notes);
+}
+
+
+BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_libdcp)
+{
+       boost::filesystem::path dir = "build/test/verify_jpeg2000_codestream_libdcp";
+       prepare_directory (dir);
+       auto dcp = make_simple (dir);
+       dcp->write_xml (dcp::Standard::SMPTE);
+       vector<dcp::VerificationNote> notes;
+       dcp::MonoPictureAsset picture (find_file(dir, "video"));
+       auto reader = picture.start_read ();
+       auto frame = reader->get_frame (0);
+       verify_j2k (frame, notes);
+       dump_notes (notes);
+}
+