Fix horizontal positioning with .srt / burn-in (#488).

diff --git a/cscript b/cscript
index ee9c586ee3fc89bcc0a05d50547350ed0df0472b..92d8a50e575b4b89d23aa58ef51c0953a296560f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -207,7 +207,7 @@ def make_spec(filename, version, target):
 
 def dependencies(target):
     return (('ffmpeg-cdist', '0492ad2'),
-            ('libdcp', '47b52fb'),
+            ('libdcp', '81fc376'),
             ('libsub', 'f66b11f'))
 
 def configure_options(target):

diff --git a/src/lib/player.cc b/src/lib/player.cc
index f53bf68d267602b0b31607de210d7fae1c7d36de..0ddd835ad38dfa25ecf4448f438d7ac57c9eca46 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -586,6 +586,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
                list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
                BOOST_FOREACH (ContentTextSubtitle& ts, text) {
                        BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) {
+                               s.set_h_position (s.h_position() + subtitle_content->subtitle_x_offset ());
                                s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
                                float const xs = subtitle_content->subtitle_x_scale();
                                float const ys = subtitle_content->subtitle_y_scale();

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 8f8958868ae2743f99eb0806bc7fd58d365688d9..0d059eb43f3194744bef1404d13a9edc4bb04dbb 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -128,23 +128,39 @@ render_subtitle (dcp::SubtitleString const & subtitle, dcp::Size target)
        int layout_height;
        layout->get_size (layout_width, layout_height);
 
+       int x = 0;
+       switch (subtitle.h_align ()) {
+       case dcp::HALIGN_LEFT:
+               /* h_position is distance between left of frame and left of subtitle */
+               x = subtitle.h_position() * target.width;
+               break;
+       case dcp::HALIGN_CENTER:
+               /* h_position is distance between centre of frame and centre of subtitle */
+               x = (0.5 + subtitle.h_position()) * target.width - layout_width / (PANGO_SCALE * 2);
+               break;
+       case dcp::HALIGN_RIGHT:
+               /* h_position is distance between right of frame and right of subtitle */
+               x = (1.0 - subtitle.h_position()) * target.width - layout_width / PANGO_SCALE;
+               break;
+       }
+
        int y = 0;
        switch (subtitle.v_align ()) {
-       case dcp::TOP:
+       case dcp::VALIGN_TOP:
                /* v_position is distance between top of frame and top of subtitle */
                y = subtitle.v_position() * target.height;
                break;
-       case dcp::CENTER:
+       case dcp::VALIGN_CENTER:
                /* v_position is distance between centre of frame and centre of subtitle */
-               y = 0.5 + subtitle.v_position() * target.height - (layout_height / (PANGO_SCALE * 2));
+               y = (0.5 + subtitle.v_position()) * target.height - layout_height / (PANGO_SCALE * 2);
                break;
-       case dcp::BOTTOM:
+       case dcp::VALIGN_BOTTOM:
                /* v_position is distance between bottom of frame and bottom of subtitle */
                y = (1.0 - subtitle.v_position()) * target.height - layout_height / PANGO_SCALE;
                break;
        }
 
-       return PositionImage (image, Position<int> ((image->size().width - layout_width * xscale / PANGO_SCALE) / 2, y));
+       return PositionImage (image, Position<int> (x, y));
 }
 
 list<PositionImage>

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index dae2e4ab755d8085114b137a2ed83b7b0a9ba187..5c6d331dfe66bb3802010657de4ed0be2bd94b71 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -68,8 +68,10 @@ SubRipDecoder::pass (PassReason)
                                        1.0,
                                        dcp::Time (_subtitles[_next].from.all_as_seconds()),
                                        dcp::Time (_subtitles[_next].to.all_as_seconds()),
+                                       0,
+                                       dcp::HALIGN_CENTER,
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
-                                       dcp::TOP,
+                                       dcp::VALIGN_TOP,
                                        j->text,
                                        dcp::NONE,
                                        dcp::Colour (255, 255, 255),