Support the 2014 version of SMPTE 428-7 in render_text.cc and use it

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 94b12ec7d38506147541c09d2b99634f82945a6d..47df4feb159ac458dc2556df203d3e9edfdc2b6e 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -856,44 +856,46 @@ 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
+ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const
 {
-       if (subtitle.valign_standard == to) {
+       if (dcp::uses_baseline(subtitle.valign_standard) == dcp::uses_baseline(to)) {
+               /* The from and to standards use the same alignment reference */
                return subtitle.v_position();
        }
 
@@ -913,7 +915,7 @@ ReelWriter::convert_vertical_position(StringText const& subtitle, dcp::Standard
                break;
        }
 
-       return subtitle.v_position() + ((subtitle.valign_standard == dcp::Standard::SMPTE) ? correction : -correction);
+       return subtitle.v_position() + (dcp::uses_bounding_box(subtitle.valign_standard) ? correction : -correction);
 }
 
 
@@ -956,7 +958,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));
+               i.set_v_position(convert_vertical_position(i, film()->interop() ? dcp::SubtitleStandard::INTEROP : dcp::SubtitleStandard::SMPTE_2014));
                auto sub = make_shared<dcp::SubtitleString>(i);
                if (type == TextType::OPEN_SUBTITLE) {
                        sub->set_font(fonts.get(i.font));