Write dummy subtitles also to empty Interop reels (#2421).

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index f9e29a16f4c15537358f68398b09c8f11b8fdea7..e0279725bc79b50a43c4bb95d25a2e1cda504610 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -114,6 +114,7 @@ ReelWriter::ReelWriter (
        , _content_summary (film()->content_summary(period))
        , _job (job)
        , _text_only (text_only)
+       , _font_metrics(film()->frame_size().height)
 {
        /* Create or find our picture asset in a subdirectory, named
           according to those film's parameters which affect the video
@@ -855,40 +856,68 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool
                if (film()->encrypted()) {
                        s->set_key (film()->key());
                }
-               if (with_dummy) {
-                       s->add (
-                               std::make_shared<dcp::SubtitleString>(
-                                       optional<std::string>(),
-                                       false,
-                                       false,
-                                       false,
-                                       dcp::Colour(),
-                                       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,
-                                       dcp::Direction::LTR,
-                                       " ",
-                                       dcp::Effect::NONE,
-                                       dcp::Colour(),
-                                       dcp::Time(),
-                                       dcp::Time(),
-                                       0
-                                       )
-                              );
-               }
                asset = s;
        }
 
+       if (with_dummy) {
+               asset->add(
+                       std::make_shared<dcp::SubtitleString>(
+                               optional<std::string>(),
+                               false,
+                               false,
+                               false,
+                               dcp::Colour(),
+                               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,
+                               dcp::Direction::LTR,
+                               " ",
+                               dcp::Effect::NONE,
+                               dcp::Colour(),
+                               dcp::Time(),
+                               dcp::Time(),
+                               0
+                               )
+                      );
+       }
+
        return asset;
 }
 
 
+float
+ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::Standard to) const
+{
+       if (subtitle.valign_standard == to) {
+               return subtitle.v_position();
+       }
+
+       auto const baseline_to_bottom = _font_metrics.baseline_to_bottom(subtitle);
+       auto const height = _font_metrics.height(subtitle);
+
+       float correction = 0;
+       switch (subtitle.v_align()) {
+       case dcp::VAlign::TOP:
+               correction = height - baseline_to_bottom;
+               break;
+       case dcp::VAlign::CENTER:
+               correction = (height / 2) - baseline_to_bottom;
+               break;
+       case dcp::VAlign::BOTTOM:
+               correction = baseline_to_bottom;
+               break;
+       }
+
+       return subtitle.v_position() + ((subtitle.valign_standard == dcp::Standard::SMPTE) ? correction : -correction);
+}
+
+
 void
 ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period, FontIdMap const& fonts)
 {
@@ -928,6 +957,7 @@ ReelWriter::write (PlayerText subs, TextType type, optional<DCPTextTrack> track,
        for (auto i: subs.string) {
                i.set_in  (dcp::Time(period.from.seconds() - _period.from.seconds(), tcr));
                i.set_out (dcp::Time(period.to.seconds() - _period.from.seconds(), tcr));
+               i.set_v_position(convert_vertical_position(i, film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE));
                auto sub = make_shared<dcp::SubtitleString>(i);
                if (type == TextType::OPEN_SUBTITLE) {
                        sub->set_font(fonts.get(i.font));