X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_text.cc;h=284e4fa88924ea97b027e5154a99ea159f88f76a;hb=5a820bb8fae34591be5ac6d19a73461b9dab532a;hp=94b41285627270868d97a95792659445cae102ce;hpb=6e1ceb315f01a233e8c449e649fa44551aa30491;p=dcpomatic.git diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 94b412856..284e4fa88 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -22,17 +22,17 @@ #include "cross.h" #include "dcpomatic_assert.h" #include "font.h" +#include "font_config.h" #include "image.h" #include "render_text.h" #include "types.h" #include "util.h" -#include "warnings.h" #include -#include +#include #include -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include @@ -51,32 +51,81 @@ using std::string; using namespace dcpomatic; -static FcConfig* fc_config = nullptr; -static list> fc_config_fonts; +/** Create a Pango layout using a dummy context which we can use to calculate the size + * of the text we will render. Then we can transfer the layout over to the real context + * for the actual render. + */ +static Glib::RefPtr +create_layout() +{ + auto c_font_map = pango_cairo_font_map_new (); + DCPOMATIC_ASSERT (c_font_map); + auto font_map = Glib::wrap (c_font_map); + auto c_context = pango_font_map_create_context (c_font_map); + DCPOMATIC_ASSERT (c_context); + auto context = Glib::wrap (c_context); + return Pango::Layout::create (context); +} + + +static void +setup_layout (Glib::RefPtr layout, string font_name, string markup) +{ + layout->set_alignment (Pango::ALIGN_LEFT); + Pango::FontDescription font (font_name); + layout->set_font_description (font); + layout->set_markup (markup); +} 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(lrintf(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; @@ -122,62 +171,15 @@ create_surface (shared_ptr image) static string -setup_font (StringText const& subtitle, list> const& fonts) +setup_font (StringText const& subtitle) { - if (!fc_config) { - fc_config = FcInitLoadConfig (); - } - auto font_file = default_font_file (); - for (auto i: fonts) { - if (i->id() == subtitle.font() && i->file()) { - font_file = i->file().get(); - } - } - - auto existing = fc_config_fonts.cbegin (); - while (existing != fc_config_fonts.end() && existing->first != font_file) { - ++existing; - } - - string font_name; - if (existing != fc_config_fonts.end ()) { - font_name = existing->second; - } else { - /* Make this font available to DCP-o-matic */ - FcConfigAppFontAddFile (fc_config, reinterpret_cast(font_file.string().c_str())); - auto pattern = FcPatternBuild ( - 0, FC_FILE, FcTypeString, font_file.string().c_str(), static_cast(0) - ); - auto object_set = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, static_cast (0)); - auto font_set = FcFontList (fc_config, pattern, object_set); - if (font_set) { - for (int i = 0; i < font_set->nfont; ++i) { - FcPattern* font = font_set->fonts[i]; - FcChar8* file; - FcChar8* family; - FcChar8* style; - if ( - FcPatternGetString (font, FC_FILE, 0, &file) == FcResultMatch && - FcPatternGetString (font, FC_FAMILY, 0, &family) == FcResultMatch && - FcPatternGetString (font, FC_STYLE, 0, &style) == FcResultMatch - ) { - font_name = reinterpret_cast (family); - } - } - - FcFontSetDestroy (font_set); - } - - FcObjectSetDestroy (object_set); - FcPatternDestroy (pattern); - - fc_config_fonts.push_back (make_pair(font_file, font_name)); + if (subtitle.font && subtitle.font->file()) { + font_file = *subtitle.font->file(); } - FcConfigSetCurrent (fc_config); - return font_name; + return FontConfig::instance()->make_font_available(font_file); } @@ -191,19 +193,30 @@ calculate_fade_factor (StringText const& first, DCPTime time, int frame_rate) */ auto const fade_in_start = DCPTime::from_seconds(first.in().as_seconds()).round(frame_rate); auto const fade_in_end = fade_in_start + DCPTime::from_seconds (first.fade_up_time().as_seconds ()); - auto const fade_out_end = DCPTime::from_seconds (first.out().as_seconds()).round(frame_rate); - auto const fade_out_start = fade_out_end - DCPTime::from_seconds (first.fade_down_time().as_seconds ()); if (fade_in_start <= time && time <= fade_in_end && fade_in_start != fade_in_end) { fade_factor *= DCPTime(time - fade_in_start).seconds() / DCPTime(fade_in_end - fade_in_start).seconds(); } - if (fade_out_start <= time && time <= fade_out_end && fade_out_start != fade_out_end) { - fade_factor *= 1 - DCPTime(time - fade_out_start).seconds() / DCPTime(fade_out_end - fade_out_start).seconds(); - } - if (time < fade_in_start || time > fade_out_end) { + + if (time < fade_in_start) { fade_factor = 0; } + /* first.out() may be zero if we don't know when this subtitle will finish. We can only think about + * fading out if we _do_ know when it will finish. + */ + if (first.out() != dcp::Time()) { + auto const fade_out_end = DCPTime::from_seconds (first.out().as_seconds()).round(frame_rate); + auto const fade_out_start = fade_out_end - DCPTime::from_seconds(first.fade_down_time().as_seconds()); + + if (fade_out_start <= time && time <= fade_out_end && fade_out_start != fade_out_end) { + fade_factor *= 1 - DCPTime(time - fade_out_start).seconds() / DCPTime(fade_out_end - fade_out_start).seconds(); + } + if (time > fade_out_end) { + fade_factor = 0; + } + } + return fade_factor; } @@ -259,38 +272,11 @@ y_position (StringText const& first, int target_height, int layout_height) } -static void -setup_layout (Glib::RefPtr layout, string font_name, string markup) -{ - layout->set_alignment (Pango::ALIGN_LEFT); - Pango::FontDescription font (font_name); - layout->set_font_description (font); - layout->set_markup (markup); -} - - -/** Create a Pango layout using a dummy context which we can use to calculate the size - * of the text we will render. Then we can transfer the layout over to the real context - * for the actual render. - */ -static Glib::RefPtr -create_layout() -{ - auto c_font_map = pango_cairo_font_map_new (); - DCPOMATIC_ASSERT (c_font_map); - auto font_map = Glib::wrap (c_font_map); - auto c_context = pango_font_map_create_context (c_font_map); - DCPOMATIC_ASSERT (c_context); - auto context = Glib::wrap (c_context); - return Pango::Layout::create (context); -} - - /** @param subtitles A list of subtitles that are all on the same line, * at the same time and with the same fade in/out. */ static PositionImage -render_line (list subtitles, list> fonts, dcp::Size target, DCPTime time, int frame_rate) +render_line (list subtitles, dcp::Size target, DCPTime time, int frame_rate) { /* XXX: this method can only handle italic / bold changes mid-line, nothing else yet. @@ -299,9 +285,9 @@ render_line (list subtitles, list> fonts, dcp::Size DCPOMATIC_ASSERT (!subtitles.empty ()); auto const& first = subtitles.front (); - auto const font_name = setup_font (first, fonts); + auto const font_name = setup_font (first); 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; @@ -387,21 +373,21 @@ render_line (list subtitles, list> fonts, dcp::Size * @param frame_rate DCP frame rate. */ list -render_text (list subtitles, list> fonts, dcp::Size target, DCPTime time, int frame_rate) +render_text (list subtitles, dcp::Size target, DCPTime time, int frame_rate) { list pending; list images; for (auto const& i: subtitles) { if (!pending.empty() && (i.v_align() != pending.back().v_align() || fabs(i.v_position() - pending.back().v_position()) > 1e-4)) { - images.push_back (render_line (pending, fonts, target, time, frame_rate)); + images.push_back(render_line(pending, target, time, frame_rate)); pending.clear (); } pending.push_back (i); } if (!pending.empty()) { - images.push_back (render_line (pending, fonts, target, time, frame_rate)); + images.push_back(render_line(pending, target, time, frame_rate)); } return images;