Handle vertical alignment of subs correctly wrt the difference between Interop and...

[dcpomatic.git] / test / render_subtitles_test.cc

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index c56f9dfa1aca54366ad088552b3a0fa7f61055ff..282c9311f7e24ef6a10bc8ee4419814f7422bc38 100644 (file)
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -18,67 +18,129 @@
 
 */
 
-#include "lib/render_subtitles.h"
+
+/** @file  test/render_text_test.cc
+ *  @brief Check markup of subtitles for rendering.
+ *  @ingroup feature
+ */
+
+
+#include "lib/image.h"
+#include "lib/image_png.h"
+#include "lib/render_text.h"
+#include "lib/string_text.h"
 #include <dcp/subtitle_string.h>
 #include <boost/test/unit_test.hpp>
 
+
+using std::shared_ptr;
+
+
 static void
-add (std::list<dcp::SubtitleString>& s, std::string text, bool italic, bool bold, bool underline)
+add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool underline)
 {
        s.push_back (
-               dcp::SubtitleString (
-                       boost::optional<std::string> (),
-                       italic,
-                       bold,
-                       underline,
-                       dcp::Colour (255, 255, 255),
-                       42,
-                       1,
-                       dcp::Time (),
-                       dcp::Time (),
-                       1,
-                       dcp::HALIGN_LEFT,
-                       1,
-                       dcp::VALIGN_TOP,
-                       dcp::DIRECTION_LTR,
-                       text,
-                       dcp::NONE,
-                       dcp::Colour (0, 0, 0),
-                       dcp::Time (),
-                       dcp::Time ()
+               StringText (
+                       dcp::SubtitleString (
+                               boost::optional<std::string> (),
+                               italic,
+                               bold,
+                               underline,
+                               dcp::Colour (255, 255, 255),
+                               42,
+                               1,
+                               dcp::Time (),
+                               dcp::Time (),
+                               1,
+                               dcp::HAlign::LEFT,
+                               1,
+                               dcp::VAlign::TOP,
+                               dcp::Direction::LTR,
+                               text,
+                               dcp::Effect::NONE,
+                               dcp::Colour (0, 0, 0),
+                               dcp::Time (),
+                               dcp::Time (),
+                               0
+                               ),
+                       2,
+                       std::shared_ptr<dcpomatic::Font>(),
+                       dcp::Standard::SMPTE
                        )
                );
 }
 
-/** Test marked_up() in render_subtitles.cc */
-BOOST_AUTO_TEST_CASE (render_markup_test1)
+
+BOOST_AUTO_TEST_CASE (marked_up_test1)
 {
-       std::list<dcp::SubtitleString> s;
+       std::list<StringText> s;
        add (s, "Hello", false, false, false);
-       BOOST_CHECK_EQUAL (marked_up (s), "Hello");
+       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
-/** Test marked_up() in render_subtitles.cc */
-BOOST_AUTO_TEST_CASE (render_markup_test2)
+
+BOOST_AUTO_TEST_CASE (marked_up_test2)
 {
-       std::list<dcp::SubtitleString> s;
+       std::list<StringText> s;
        add (s, "Hello", false, true, false);
-       BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b>");
+       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 
-/** Test marked_up() in render_subtitles.cc */
-BOOST_AUTO_TEST_CASE (render_markup_test3)
+BOOST_AUTO_TEST_CASE (marked_up_test3)
 {
-       std::list<dcp::SubtitleString> s;
+       std::list<StringText> s;
        add (s, "Hello", true, true, false);
-       BOOST_CHECK_EQUAL (marked_up (s), "<i><b>Hello</b></i>");
+       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_subtitles.cc */
-BOOST_AUTO_TEST_CASE (render_markup_test4)
+BOOST_AUTO_TEST_CASE (marked_up_test4)
 {
-       std::list<dcp::SubtitleString> s;
+       std::list<StringText> s;
        add (s, "Hello", true, true, true);
-       BOOST_CHECK_EQUAL (marked_up (s), "<i><b><u>Hello</u></b></i>");
+       BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+}
+
+BOOST_AUTO_TEST_CASE (marked_up_test5)
+{
+       std::list<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=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
 }
+
+BOOST_AUTO_TEST_CASE (marked_up_test6)
+{
+       std::list<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=\"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>");
+}
+
+
+#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