From ccd69987ab861ea4521836fa2a5227e2dfac3479 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 15 Oct 2021 22:25:42 +0200 Subject: [PATCH] Basic and slightly inaccurate support for in subtitles (#2103). Adding horizontal space to a Pango layout is hard, and I think this change probably gets it slightly wrong, but it's a step in the right direction. --- cscript | 4 +-- src/lib/reel_writer.cc | 3 +- src/lib/render_text.cc | 58 +++++++++++++++++++++++++---------- src/lib/render_text.h | 2 +- src/lib/text_decoder.cc | 3 +- src/lib/util.cc | 2 +- test/render_subtitles_test.cc | 15 ++++----- wscript | 4 +-- 8 files changed, 60 insertions(+), 31 deletions(-) diff --git a/cscript b/cscript index 773b80d54..1d4107c02 100644 --- a/cscript +++ b/cscript @@ -431,8 +431,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.2')) - deps.append(('libsub', 'v1.6.2')) + deps.append(('libdcp', 'v1.8.3')) + deps.append(('libsub', 'v1.6.3')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 44da409a1..78148d18f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -839,7 +839,8 @@ ReelWriter::empty_text_asset (TextType type, optional track, bool dcp::Effect::NONE, dcp::Colour(), dcp::Time(), - dcp::Time() + dcp::Time(), + 0 ) ); } diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 989bc7dfe..bcf04147a 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -83,27 +83,53 @@ setup_layout (Glib::RefPtr layout, string font_name, string marku string -marked_up (list subtitles, int target_height, float fade_factor) +marked_up (list subtitles, int target_height, float fade_factor, string font_name) { - string out; + auto constexpr pixels_to_1024ths_point = 72 * 1024 / 96; - for (auto const& i: subtitles) { - out += "(i.size_in_pixels(target_height) * 72 * 1024 / 96) + "\" "; + span += "size=\"" + dcp::raw_convert(subtitle.size_in_pixels(target_height) * pixels_to_1024ths_point) + "\" "; /* Between 1-65535 inclusive, apparently... */ - out += "alpha=\"" + dcp::raw_convert(int(floor(fade_factor * 65534)) + 1) + "\" "; - out += "color=\"#" + i.colour().to_rgb_string() + "\">"; - out += i.text(); - out += ""; + span += "alpha=\"" + dcp::raw_convert(int(floor(fade_factor * 65534)) + 1) + "\" "; + span += "color=\"#" + subtitle.colour().to_rgb_string() + "\""; + if (!extra_attribute.empty()) { + span += " " + extra_attribute; + } + span += ">"; + span += text; + span += ""; + return span; + }; + + string out; + for (auto const& i: subtitles) { + if (std::abs(i.space_before()) > dcp::SPACE_BEFORE_EPSILON) { + /* We need to insert some horizontal space into the layout. The only way I can find to do this + * is to write a " " with some special letter_spacing. As far as I can see, such a space will + * be written with letter_spacing either side. This means that to get a horizontal space x we + * need to write a " " with letter spacing (x - s) / 2, where s is the width of the " ". + */ + auto layout = create_layout(); + setup_layout(layout, font_name, make_span(i, " ", {})); + int space_width; + int dummy; + layout->get_pixel_size(space_width, dummy); + auto spacing = ((i.space_before() * i.size_in_pixels(target_height) - space_width) / 2) * pixels_to_1024ths_point; + out += make_span(i, " ", "letter_spacing=\"" + dcp::raw_convert(spacing) + "\""); + } + + out += make_span(i, i.text(), {}); } return out; @@ -301,7 +327,7 @@ render_line (list subtitles, list> fonts, dcp::Size auto const font_name = setup_font (first, fonts); auto const fade_factor = calculate_fade_factor (first, time, frame_rate); - auto const markup = marked_up (subtitles, target.height, fade_factor); + 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; diff --git a/src/lib/render_text.h b/src/lib/render_text.h index d1c8c7aee..07a97bb40 100644 --- a/src/lib/render_text.h +++ b/src/lib/render_text.h @@ -27,7 +27,7 @@ namespace dcpomatic { class Font; } -std::string marked_up (std::list subtitles, int target_height, float fade_factor); +std::string marked_up (std::list subtitles, int target_height, float fade_factor, std::string font_name); std::list render_text ( std::list, std::list > fonts, dcp::Size, dcpomatic::DCPTime, int ); diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 88f7cd4a9..99b68faba 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -247,7 +247,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) use libsub for DCP subs) we can cheat by just putting 0 in here. */ dcp::Time (), - dcp::Time () + dcp::Time (), + 0 ) ); } diff --git a/src/lib/util.cc b/src/lib/util.cc index 78ed8da99..c165a5129 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -406,7 +406,7 @@ DCPOMATIC_ENABLE_WARNINGS list subs; dcp::SubtitleString ss( optional(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, dcp::Direction::LTR, - "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time() + "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0 ); subs.push_back (StringText(ss, 0)); render_text (subs, list>(), dcp::Size(640, 480), DCPTime(), 24); diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc index a81ef05bf..5774c8e9a 100644 --- a/test/render_subtitles_test.cc +++ b/test/render_subtitles_test.cc @@ -51,7 +51,8 @@ add (std::list& s, std::string text, bool italic, bool bold, bool un dcp::Effect::NONE, dcp::Colour (0, 0, 0), dcp::Time (), - dcp::Time () + dcp::Time (), + 0 ), 2 ) @@ -63,7 +64,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test1) { std::list s; add (s, "Hello", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -71,7 +72,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test2) { std::list s; add (s, "Hello", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } @@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test3) { std::list s; add (s, "Hello", true, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test4) { std::list s; add (s, "Hello", true, true, true); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello"); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello"); } /** Test marked_up() in render_text.cc */ @@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test5) std::list s; add (s, "Hello", false, true, false); add (s, " world.", false, false, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello world."); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello world."); } /** Test marked_up() in render_text.cc */ @@ -107,5 +108,5 @@ BOOST_AUTO_TEST_CASE (render_markup_test6) add (s, "Hello", true, false, false); add (s, " world ", false, false, false); add (s, "we are bold.", false, true, false); - BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "Hello world we are bold."); + BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "Hello world we are bold."); } diff --git a/wscript b/wscript index fcfa8561d..db47ae274 100644 --- a/wscript +++ b/wscript @@ -35,8 +35,8 @@ except ImportError: from waflib import Logs, Context APPNAME = 'dcpomatic' -libdcp_version = '1.8.2' -libsub_version = '1.6.2' +libdcp_version = '1.8.3' +libsub_version = '1.6.3' this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] -- 2.30.2