*/
+
#include "lib/film.h"
-#include "lib/text_content.h"
#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
#include "test.h"
-#include <dcp/dcp.h>
#include <dcp/cpl.h>
+#include <dcp/dcp.h>
#include <dcp/reel.h>
#include <dcp/reel_closed_caption_asset.h>
#include <boost/test/unit_test.hpp>
+
using std::list;
using std::make_shared;
-using std::shared_ptr;
+
/** Basic test that Interop closed captions are written */
BOOST_AUTO_TEST_CASE (closed_caption_test1)
content->only_text()->set_type (TextType::CLOSED_CAPTION);
- film->make_dcp ();
- BOOST_REQUIRE (!wait_for_jobs ());
+ make_and_verify_dcp (
+ film,
+ {
+ dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+ dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
+ dcp::VerificationNote::Code::MISSING_CPL_METADATA
+ });
/* Just check to see that there's a CCAP in the CPL: this
check could be better!
auto film = new_test_film2 ("closed_caption_test2", { content1, content2, content3 }, &cl);
content1->only_text()->set_type (TextType::CLOSED_CAPTION);
- content1->only_text()->set_dcp_track (DCPTextTrack("First track", "fr-FR"));
+ content1->only_text()->set_dcp_track (DCPTextTrack("First track", dcp::LanguageTag("fr-FR")));
content2->only_text()->set_type (TextType::CLOSED_CAPTION);
- content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "de-DE"));
+ content2->only_text()->set_dcp_track (DCPTextTrack("Second track", dcp::LanguageTag("de-DE")));
content3->only_text()->set_type (TextType::CLOSED_CAPTION);
- content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "it-IT"));
+ content3->only_text()->set_dcp_track (DCPTextTrack("Third track", dcp::LanguageTag("it-IT")));
make_and_verify_dcp (
film,
{
dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION,
dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_LINE_LENGTH,
- dcp::VerificationNote::Code::MISSING_CPL_METADATA
- }
+ dcp::VerificationNote::Code::MISSING_CPL_METADATA,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+ },
+ true,
+ /* Clairmeta gives an error about having duplicate ClosedCaption entries,
+ * which seems wrong.
+ */
+ false
);
dcp::DCP check (film->dir(film->dcp_name()));
BOOST_REQUIRE_EQUAL (ccaps.size(), 3U);
auto i = ccaps.begin ();
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "First track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "fr-FR");
++i;
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Second track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "de-DE");
++i;
- BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
+ BOOST_CHECK_EQUAL ((*i)->annotation_text().get_value_or(""), "Third track");
BOOST_REQUIRE (static_cast<bool>((*i)->language()));
BOOST_CHECK_EQUAL ((*i)->language().get(), "it-IT");