From 5e7ec41119961114a9b4df90d1c9ced580667f54 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Dec 2022 00:51:56 +0100 Subject: Support the 2014 version of SMPTE 428-7 in render_text.cc and use it when placing subtitles (e.g. SRT). Also default to outputting 2014-era alignment. --- src/lib/text_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/text_decoder.cc') diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 6fd036ae1..2541bbc9b 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -88,7 +88,7 @@ set_forced_appearance(shared_ptr content, StringText& subtitl void -TextDecoder::emit_plain_start (ContentTime from, vector subtitles, dcp::Standard valign_standard) +TextDecoder::emit_plain_start(ContentTime from, vector subtitles, dcp::SubtitleStandard valign_standard) { vector string_texts; @@ -265,7 +265,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti dcp_subtitle, content()->outline_width(), content()->get_font(block.font.get_value_or("")), - dcp::Standard::SMPTE + dcp::SubtitleStandard::SMPTE_2014 ); set_forced_appearance(content(), string_text); string_texts.push_back(string_text); @@ -285,7 +285,7 @@ TextDecoder::emit_stop (ContentTime to) void -TextDecoder::emit_plain (ContentTimePeriod period, vector subtitles, dcp::Standard valign_standard) +TextDecoder::emit_plain(ContentTimePeriod period, vector subtitles, dcp::SubtitleStandard valign_standard) { emit_plain_start (period.from, subtitles, valign_standard); emit_stop (period.to); -- cgit v1.2.3 From 0d87795d5305db9d75894ba9857662b1c0cfeeb3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jan 2023 23:41:23 +0100 Subject: Align text subtitles from the bottom of the screen. --- src/lib/text_decoder.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/lib/text_decoder.cc') diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 2541bbc9b..58f631e59 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -153,13 +153,20 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti switch (line.vertical_position.reference.get_value_or(sub::BOTTOM_OF_SCREEN)) { case sub::BOTTOM_OF_SCREEN: case sub::TOP_OF_SUBTITLE: - /* This 0.9 is an arbitrary value to lift the bottom sub off the bottom + /* This 0.1 is an arbitrary value to lift the bottom sub off the bottom of the screen a bit to a pleasing degree. */ - v_position = 0.9 - + v_position = 0.1 + (1 + bottom_line.get() - line.vertical_position.line.get()) * multiplier; - v_align = dcp::VAlign::TOP; + /* Align our subtitles to the bottom of the screen, because if we are making a SMPTE + * DCP and the projection system uses the wrong standard to interpret vertical position, + * a bottom-aligned subtitle will be less wrong than a top-aligned one. This is because + * in the top-aligned case the difference will be the distance between bbox top an + * baseline, but in the bottom-aligned case the difference will be between bbox bottom + * and baseline (which is shorter). + */ + v_align = dcp::VAlign::BOTTOM; break; case sub::TOP_OF_SCREEN: /* This 0.1 is another fudge factor to bring the top line away from the top of the screen a little */ -- cgit v1.2.3