X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=e3034def01f209d7bab87914163bbe653d20eed4;hb=2625d95fa19fe8ee4f61a8d7edd43f9ae6543788;hp=a8db80c8b30bdc45c78e335f204afde56e1fe83b;hpb=0e4a58abdc78f84478031acdc0acb95f5cb9a2a6;p=dcpomatic.git diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index a8db80c8b..e3034def0 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -18,20 +18,31 @@ */ + /** @file test/render_text_test.cc * @brief Check markup of subtitles for rendering. - * @ingroup specific + * @ingroup feature */ + +#include "lib/image.h" +#include "lib/image_png.h" #include "lib/render_text.h" +#include "lib/string_text.h" +#include "test.h" #include #include + +using std::make_shared; +using std::shared_ptr; + + static void -add (std::list& s, std::string text, bool italic, bool bold, bool underline) +add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool underline) { s.push_back ( - PlainText ( + StringText ( dcp::SubtitleString ( boost::optional<std::string> (), italic, @@ -43,68 +54,147 @@ add (std::list<PlainText>& s, std::string text, bool italic, bool bold, bool und dcp::Time (), dcp::Time (), 1, - dcp::HALIGN_LEFT, + dcp::HAlign::LEFT, 1, - dcp::VALIGN_TOP, - dcp::DIRECTION_LTR, + dcp::VAlign::TOP, + 0, + dcp::Direction::LTR, text, - dcp::NONE, + dcp::Effect::NONE, dcp::Colour (0, 0, 0), dcp::Time (), - dcp::Time () - ) + dcp::Time (), + 0, + std::vector<dcp::Ruby>() + ), + 2, + std::shared_ptr<dcpomatic::Font>(), + dcp::SubtitleStandard::SMPTE_2014 ) ); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test1) + +BOOST_AUTO_TEST_CASE (marked_up_test1) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); + BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test2) + +BOOST_AUTO_TEST_CASE (marked_up_test2) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); + BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test3) +BOOST_AUTO_TEST_CASE (marked_up_test3) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", true, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); + BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test4) +BOOST_AUTO_TEST_CASE (marked_up_test4) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", true, true, true); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); + BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>"); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test5) +BOOST_AUTO_TEST_CASE (marked_up_test5) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", false, true, false); add (s, " world.", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>"); } -/** Test marked_up() in render_text.cc */ -BOOST_AUTO_TEST_CASE (render_markup_test6) +BOOST_AUTO_TEST_CASE (marked_up_test6) { - std::list<PlainText> s; + std::vector<StringText> s; add (s, "Hello", true, false, false); add (s, " world ", false, false, false); add (s, "we are bold.", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>"); } + + +BOOST_AUTO_TEST_CASE(render_text_with_newline_test) +{ + std::list<dcp::SubtitleString> ss = { + { + {}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0, + dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24), + 0.5, dcp::HAlign::CENTER, + 0.5, dcp::VAlign::CENTER, + 0.0, + dcp::Direction::LTR, + "Hello world", + dcp::Effect::NONE, dcp::Colour(0, 0, 0), + {}, {}, + 0, + std::vector<dcp::Ruby>() + }, + { + {}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0, + dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24), + 0.5, dcp::HAlign::CENTER, + 0.5, dcp::VAlign::CENTER, + 0.0, + dcp::Direction::LTR, + "\n", + dcp::Effect::NONE, dcp::Colour(0, 0, 0), + {}, {}, + 0, + std::vector<dcp::Ruby>() + } + }; + + std::vector<StringText> st; + for (auto i: ss) { + st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014}); + } + + auto images = render_text(st, dcp::Size(1998, 1080), {}, 24); + + BOOST_CHECK_EQUAL(images.size(), 1U); + image_as_png(Image::ensure_alignment(images.front().image, Image::Alignment::PADDED)).write("build/test/render_text_with_newline_test.png"); +#if defined(DCPOMATIC_OSX) + check_image("test/data/mac/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png"); +#elif defined(DCPOMATIC_WINDOWS) + check_image("test/data/windows/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png"); +#else + check_image("test/data/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png"); +#endif +} + + +#if 0 + +BOOST_AUTO_TEST_CASE (render_text_test) +{ + auto dcp_string = dcp::SubtitleString( + {}, false, false, false, dcp::Colour(255, 255, 255), 42, 1.0, + dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24), + 0.5, dcp::HAlign::CENTER, + 0.5, dcp::VAlign::CENTER, + dcp::Direction::LTR, + "HÄllo jokers", + dcp::Effect::NONE, dcp::Colour(0, 0, 0), + {}, {}, + 0 + ); + + auto string_text = StringText(dcp_string, 0, shared_ptr<dcpomatic::Font>()); + + auto images = render_text({ string_text }, dcp::Size(1998, 1080), {}, 24); + + BOOST_CHECK_EQUAL(images.size(), 1U); + image_as_png(Image::ensure_alignment(images.front().image, Image::Alignment::PADDED)).write("build/test/render_text_test.png"); +} + +#endif