*/
+
/** @file test/burnt_subtitle_test.cc
* @brief Test the burning of subtitles into the DCP.
* @ingroup feature
*/
-#include "lib/plain_text_content.h"
-#include "lib/dcp_text_content.h"
+
+#include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
+#include "lib/dcp_content_type.h"
#include "lib/film.h"
+#include "lib/ffmpeg_encoder.h"
+#include "lib/log_entry.h"
#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
#include "lib/text_content.h"
-#include "lib/dcp_content.h"
-#include "lib/content_factory.h"
-#include "lib/config.h"
-#include "lib/log_entry.h"
#include "test.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel_picture_asset.h>
#include <dcp/reel_mono_picture_asset.h>
#include <boost/test/unit_test.hpp>
-#include <iostream>
-using std::cout;
-using std::map;
-using std::shared_ptr;
+
using std::dynamic_pointer_cast;
using std::make_shared;
+using std::map;
+using std::string;
using namespace dcpomatic;
+
/** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */
BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
{
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- auto content = make_shared<StringText>(film, "test/data/subrip2.srt");
- content->subtitle->set_use (true);
- content->subtitle->set_burn (true);
+ auto content = content_factory("test/data/subrip2.srt")[0];
+ content->text[0]->set_use(true);
+ content->text[0]->set_burn(true);
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- make_and_verify_dcp (film);
+ make_and_verify_dcp(
+ film,
+ { dcp::VerificationNote::Code::MISSING_CPL_METADATA }
+ );
- check_dcp ("test/data/burnt_subtitle_test_subrip", film->dir (film->dcp_name ()));
+#ifdef DCPOMATIC_WINDOWS
+ check_dcp("test/data/windows/burnt_subtitle_test_subrip", film);
+#else
+ check_dcp("test/data/burnt_subtitle_test_subrip", film);
+#endif
}
/** Build a small DCP with no picture and a single subtitle overlaid onto it from a DCP XML file */
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- auto content = make_shared<DCPTextContent>(film, "test/data/dcp_sub.xml");
- content->subtitle->set_use (true);
+ auto content = content_factory("test/data/dcp_sub.xml")[0];
+ content->text[0]->set_use(true);
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs());
- make_and_verify_dcp (film);
-
- check_dcp ("test/data/burnt_subtitle_test_dcp", film->dir (film->dcp_name ()));
+ 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
+ });
+
+ check_dcp("test/data/burnt_subtitle_test_dcp", film);
}
/** Burn some subtitles into an existing DCP to check the colour conversion */
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- film->examine_and_add_content (content_factory(film, "test/data/flat_black.png").front());
+ film->examine_and_add_content(content_factory("test/data/flat_black.png")[0]);
BOOST_REQUIRE (!wait_for_jobs());
make_and_verify_dcp (film);
film2->set_container (Ratio::from_id ("185"));
film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film2->set_name ("frobozz");
- auto background_dcp = make_shared<DCPContent>(film2, film->dir(film->dcp_name()));
+ auto background_dcp = make_shared<DCPContent>(film->dir(film->dcp_name()));
film2->examine_and_add_content (background_dcp);
- auto sub = dynamic_pointer_cast<StringText> (
- content_factory(film2, "test/data/subrip2.srt").front()
- );
- sub->subtitle->set_burn (true);
- sub->subtitle->set_outline (true);
+ auto sub = content_factory("test/data/subrip2.srt")[0];
+ sub->text[0]->set_burn(true);
+ sub->text[0]->set_effect(dcp::Effect::BORDER);
film2->examine_and_add_content (sub);
BOOST_REQUIRE (!wait_for_jobs());
make_and_verify_dcp (film2);
dcp::DCP dcp (film2->dir (film2->dcp_name ()));
dcp.read ();
- BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
- BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1);
+ BOOST_REQUIRE_EQUAL(dcp.cpls().size(), 1U);
+ BOOST_REQUIRE_EQUAL(dcp.cpls().front()->reels().size(), 1U);
BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture());
BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()->asset());
auto pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
BOOST_CHECK_EQUAL (xyz->size().width, 1998);
BOOST_CHECK_EQUAL (xyz->size().height, 1080);
- check_dcp ("test/data/burnt_subtitle_test_onto_dcp", film->dir(film->dcp_name()));
+#ifdef DCPOMATIC_WINDOWS
+ check_dcp("test/data/windows/burnt_subtitle_test_onto_dcp2", film2);
+#else
+ check_dcp("test/data/burnt_subtitle_test_onto_dcp2", film2);
+#endif
}
+
+
+
+/** Check positioning of some burnt subtitles from XML files */
+BOOST_AUTO_TEST_CASE(burnt_subtitle_test_position)
+{
+ auto check = [](string alignment)
+ {
+ auto const name = String::compose("burnt_subtitle_test_position_%1", alignment);
+ auto subs = content_factory(String::compose("test/data/burn_%1.xml", alignment));
+ auto film = new_test_film2(name, subs);
+ subs[0]->text[0]->set_use(true);
+ subs[0]->text[0]->set_burn(true);
+ 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
+ });
+
+#ifdef DCPOMATIC_WINDOWS
+ check_dcp(String::compose("test/data/windows/%1", name), film);
+#else
+ check_dcp(String::compose("test/data/%1", name), film);
+#endif
+ };
+
+ /* Should have a baseline 216 pixels from the top (0.2 * 1080) */
+ check("top");
+ /* Should have a baseline 756 pixels from the top ((0.5 + 0.2) * 1080) */
+ check("center");
+ /* Should have a baseline 864 pixels from the top ((1 - 0.2) * 1080) */
+ check("bottom");
+}
+
+
+/* Bug #2743 */
+BOOST_AUTO_TEST_CASE(burn_empty_subtitle_test)
+{
+ Cleanup cl;
+
+ auto content = content_factory("test/data/empty_sub.xml")[0];
+ auto film = new_test_film2("burnt_empty_subtitle_test", { content });
+ content->text[0]->set_use(true);
+
+ auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
+ auto file = boost::filesystem::path("build") / "test" / "burnt_empty_subtitle_test.mov";
+ cl.add(file);
+ FFmpegEncoder encoder(film, job, file, ExportFormat::PRORES_4444, false, false, false, 23);
+ encoder.go();
+
+ cl.run();
+}
+
+
projects / dcpomatic.git / blobdiff