X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.cc;h=9426427fd507385a12973e0b02823af4c15b19da;hb=36e42b01e3209f0e80dde2ac3813ca71cc605b6f;hp=c99827d108da8421faa7a65b8b278283a932d089;hpb=b42066b7d664ac322e6d2c79c5b0fa8bb0eb75c9;p=dcpomatic.git diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc index c99827d10..9426427fd 100644 --- a/src/lib/render_subtitles.cc +++ b/src/lib/render_subtitles.cc @@ -24,9 +24,13 @@ #include "cross.h" #include "font.h" #include "dcpomatic_assert.h" +#include #include #include #include +#ifndef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT +#include +#endif #include #include @@ -45,53 +49,38 @@ static FcConfig* fc_config = 0; static list > fc_config_fonts; string -marked_up (list subtitles) +marked_up (list subtitles, int target_height, float fade_factor) { string out; - bool italic = false; - bool bold = false; - bool underline = false; - BOOST_FOREACH (SubtitleString const & i, subtitles) { - if (i.italic() && !italic) { - out += ""; - } - if (i.bold() && !bold) { - out += ""; - } - if (i.underline() && !underline) { - out += ""; - } - if (!i.underline() && underline) { - out += ""; + BOOST_FOREACH (SubtitleString const & i, subtitles) { + out += "(i.size_in_pixels(target_height) * 72 * 1024 / 96) + "\" "; + /* 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 (); - } - - if (underline) { - out += ""; - } - if (bold) { - out += ""; - } - if (italic) { - out += ""; + out += ""; } return out; } +static void +set_source_rgba (Cairo::RefPtr context, dcp::Colour colour, float fade_factor) +{ + context->set_source_rgba (float(colour.r) / 255, float(colour.g) / 255, float(colour.b) / 255, fade_factor); +} + /** @param subtitles A list of subtitles that are all on the same line, * at the same time and with the same fade in/out. */ @@ -123,8 +112,12 @@ render_line (list subtitles, list > fonts, dcp: least tall enough for this subtitle. */ + int largest = 0; + BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) { + largest = max (largest, i.size()); + } /* Basic guess on height... */ - int height = subtitles.front().size() * target.height / (11 * 72); + int height = largest * target.height / (11 * 72); /* ...scaled... */ height *= yscale; /* ...and add a bit more for luck */ @@ -244,13 +237,6 @@ render_line (list subtitles, list > fonts, dcp: context->set_line_width (1); - /* Render the subtitle at the top left-hand corner of image */ - - Pango::FontDescription font (font_name); - font.set_absolute_size (subtitles.front().size_in_pixels (target.height) * PANGO_SCALE); - layout->set_font_description (font); - layout->set_markup (marked_up (subtitles)); - /* Compute fade factor */ float fade_factor = 1; @@ -262,8 +248,16 @@ render_line (list subtitles, list > fonts, dcp: fade_factor = DCPTime(time - fade_in_start).seconds() / DCPTime(fade_in_end - fade_in_start).seconds(); } else 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(); + } else if (time < fade_in_start || time > fade_out_end) { + fade_factor = 0; } + /* Render the subtitle at the top left-hand corner of image */ + + Pango::FontDescription font (font_name); + layout->set_font_description (font); + layout->set_markup (marked_up (subtitles, target.height, fade_factor)); + context->scale (xscale, yscale); layout->update_from_cairo_context (context); @@ -271,35 +265,36 @@ render_line (list subtitles, list > fonts, dcp: side of the first character's border is not cut off. */ int const x_offset = subtitles.front().effect() == dcp::BORDER ? (target.width / 600.0) : 0; + /* Move down a bit so that accents on capital letters can be seen */ + int const y_offset = target.height / 100.0; if (subtitles.front().effect() == dcp::SHADOW) { /* Drop-shadow effect */ - dcp::Colour const ec = subtitles.front().effect_colour (); - context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor); - context->move_to (x_offset + 4, 4); + set_source_rgba (context, subtitles.front().effect_colour(), fade_factor); + context->move_to (x_offset + 4, y_offset + 4); layout->add_to_cairo_context (context); context->fill (); } if (subtitles.front().effect() == dcp::BORDER) { /* Border effect; stroke the subtitle with a large (arbitrarily chosen) line width */ - dcp::Colour ec = subtitles.front().effect_colour (); - context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor); + set_source_rgba (context, subtitles.front().effect_colour(), fade_factor); context->set_line_width (subtitles.front().outline_width * target.width / 2048.0); context->set_line_join (Cairo::LINE_JOIN_ROUND); - context->move_to (x_offset, 0); + context->move_to (x_offset, y_offset); layout->add_to_cairo_context (context); context->stroke (); } /* The actual subtitle */ - dcp::Colour const c = subtitles.front().colour (); - context->set_source_rgba (float(c.r) / 255, float(c.g) / 255, float(c.b) / 255, fade_factor); context->set_line_width (0); - context->move_to (x_offset, 0); - layout->add_to_cairo_context (context); - context->fill (); + context->move_to (x_offset, y_offset); +#ifdef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT + layout->show_in_cairo_context (context); +#else + pango_cairo_show_layout (context->cobj(), layout->gobj()); +#endif int layout_width; int layout_height;