Fix typo in log message.

[dcpomatic.git] / src / lib / render_text.cc

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index 284e4fa88924ea97b027e5154a99ea159f88f76a..9c1c233c26c12c1bf0202e4f2c9683c2eb3f00f9 100644 (file)
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -245,27 +245,41 @@ x_position (StringText const& first, int target_width, int layout_width)
 
 
 static int
-y_position (StringText const& first, int target_height, int layout_height)
+y_position (StringText const& first, int target_height, int baseline_to_bottom, int layout_height)
 {
        int y = 0;
-       switch (first.v_align()) {
-       case dcp::VAlign::TOP:
-               /* SMPTE says that v_position is the distance between top
-                  of frame and top of subtitle, but this doesn't always seem to be
-                  the case in practice; Gunnar Ásgeirsson's Dolby server appears
-                  to put VAlign::TOP subs with v_position as the distance between top
-                  of frame and bottom of subtitle.
-               */
-               y = first.v_position() * target_height - layout_height;
-               break;
-       case dcp::VAlign::CENTER:
-               /* v_position is distance between centre of frame and centre of subtitle */
-               y = (0.5 + first.v_position()) * target_height - layout_height / 2;
-               break;
-       case dcp::VAlign::BOTTOM:
-               /* v_position is distance between bottom of frame and bottom of subtitle */
-               y = (1.0 - first.v_position()) * target_height - layout_height;
+       switch (first.valign_standard) {
+       case dcp::Standard::INTEROP:
+               switch (first.v_align()) {
+               case dcp::VAlign::TOP:
+                       /* v_position is distance from top of frame to subtitle baseline */
+                       y = first.v_position() * target_height - (layout_height - baseline_to_bottom);
+                       break;
+               case dcp::VAlign::CENTER:
+                       /* v_position is distance from centre of frame to subtitle baseline */
+                       y = (0.5 + first.v_position()) * target_height - (layout_height - baseline_to_bottom);
+                       break;
+               case dcp::VAlign::BOTTOM:
+                       /* v_position is distance from bottom of frame to subtitle baseline */
+                       y = (1.0 - first.v_position()) * target_height - (layout_height - baseline_to_bottom);
+                       break;
+               }
                break;
+       case dcp::Standard::SMPTE:
+               switch (first.v_align()) {
+               case dcp::VAlign::TOP:
+                       /* v_position is distance from top of frame to top of subtitle */
+                       y = first.v_position() * target_height;
+                       break;
+               case dcp::VAlign::CENTER:
+                       /* v_position is distance from centre of frame to centre of subtitle */
+                       y = (0.5 + first.v_position()) * target_height - layout_height / 2;
+                       break;
+               case dcp::VAlign::BOTTOM:
+                       /* v_position is distance from bottom of frame to bottom of subtitle */
+                       y = (1.0 - first.v_position()) * target_height - layout_height;
+                       break;
+               }
        }
 
        return y;
@@ -290,8 +304,8 @@ render_line (list<StringText> subtitles, dcp::Size target, DCPTime time, int fra
        auto const markup = marked_up (subtitles, target.height, fade_factor, font_name);
        auto layout = create_layout ();
        setup_layout (layout, font_name, markup);
-       dcp::Size size;
-       layout->get_pixel_size (size.width, size.height);
+       auto ink = layout->get_ink_extents();
+       dcp::Size size{ink.get_width() / Pango::SCALE, ink.get_height() / Pango::SCALE};
 
        /* Calculate x and y scale factors.  These are only used to stretch
           the font away from its normal aspect ratio.
@@ -316,12 +330,8 @@ render_line (list<StringText> subtitles, dcp::Size target, DCPTime time, int fra
        size.height *= y_scale;
 
        /* Shuffle the subtitle over by the border width (if we have any) so it's not cut off */
-       int const x_offset = ceil (border_width);
-       /* Move down a bit so that accents on capital letters can be seen */
-       int const y_offset = target.height / 100.0;
-
-       size.width += x_offset;
-       size.height += y_offset;
+       int const x_offset = (-ink.get_x() / Pango::SCALE) + ceil(border_width);
+       int const y_offset = -ink.get_y() / Pango::SCALE + ceil(border_width);
 
        auto image = create_image (size);
        auto surface = create_surface (image);
@@ -363,7 +373,7 @@ render_line (list<StringText> subtitles, dcp::Size target, DCPTime time, int fra
        context->stroke ();
 
        int const x = x_position (first, target.width, size.width);
-       int const y = y_position (first, target.height, size.height);
+       int const y = y_position (first, target.height, ink.get_y() / Pango::SCALE, size.height);
        return PositionImage (image, Position<int>(max (0, x), max(0, y)));
 }
 
@@ -387,7 +397,7 @@ render_text (list<StringText> subtitles, dcp::Size target, DCPTime time, int fra
        }
 
        if (!pending.empty()) {
-               images.push_back(render_line(pending,  target, time, frame_rate));
+               images.push_back(render_line(pending, target, time, frame_rate));
        }
 
        return images;