X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.cc;h=782d06532e378d240699419c3031ae41fe04191a;hb=6543cce6266e2f8389cf1c3987252caf9e254a5a;hp=a047c8173ed75bbadbca90b0a33e72870bda1bd5;hpb=643ad504511dd10f4f2b5ff82c8c6e67549d5013;p=dcpomatic.git diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc index a047c8173..782d06532 100644 --- a/src/lib/render_subtitles.cc +++ b/src/lib/render_subtitles.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,9 +23,12 @@ #include "image.h" #include "cross.h" #include "font.h" +#include "dcpomatic_assert.h" +#include #include #include #include +#include using std::list; using std::cout; @@ -38,23 +42,78 @@ using boost::shared_ptr; using boost::optional; static FcConfig* fc_config = 0; -static list > fc_config_fonts; +static list > fc_config_fonts; + +string +marked_up (list subtitles) +{ + string out; + bool italic = false; + bool bold = false; + bool underline = false; + BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) { + if (i.italic() && !italic) { + out += ""; + } + if (i.bold() && !bold) { + out += ""; + } + if (i.underline() && !underline) { + out += ""; + } + if (!i.underline() && underline) { + out += ""; + } + if (!i.bold() && bold) { + out += ""; + } + if (!i.italic() && italic) { + out += ""; + } + + italic = i.italic (); + bold = i.bold (); + underline = i.underline (); + + out += i.text (); + } + + if (underline) { + out += ""; + } + if (bold) { + out += ""; + } + if (italic) { + out += ""; + } + + return out; +} + +/** @param subtitles A list of subtitles that are all on the same line */ static PositionImage -render_subtitle (dcp::SubtitleString const & subtitle, list > fonts, dcp::Size target) +render_line (list subtitles, list > fonts, dcp::Size target) { + /* XXX: this method can only handle italic / bold changes mid-line, + nothing else yet. + */ + + DCPOMATIC_ASSERT (!subtitles.empty ()); + /* Calculate x and y scale factors. These are only used to stretch the font away from its normal aspect ratio. */ float xscale = 1; float yscale = 1; - if (fabs (subtitle.aspect_adjust() - 1.0) > dcp::ASPECT_ADJUST_EPSILON) { - if (subtitle.aspect_adjust() < 1) { - xscale = max (0.25f, subtitle.aspect_adjust ()); + if (fabs (subtitles.front().aspect_adjust() - 1.0) > dcp::ASPECT_ADJUST_EPSILON) { + if (subtitles.front().aspect_adjust() < 1) { + xscale = max (0.25f, subtitles.front().aspect_adjust ()); yscale = 1; } else { xscale = 1; - yscale = 1 / min (4.0f, subtitle.aspect_adjust ()); + yscale = 1 / min (4.0f, subtitles.front().aspect_adjust ()); } } @@ -63,15 +122,16 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f */ /* Basic guess on height... */ - int height = subtitle.size() * target.height / (11 * 72); + int height = subtitles.front().size() * target.height / (11 * 72); /* ...scaled... */ height *= yscale; /* ...and add a bit more for luck */ height += target.height / 11; - shared_ptr image (new Image (PIX_FMT_RGBA, dcp::Size (target.width, height), false)); + shared_ptr image (new Image (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false)); image->make_black (); +#ifdef DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH Cairo::RefPtr surface = Cairo::ImageSurface::create ( image->data()[0], Cairo::FORMAT_ARGB32, @@ -79,6 +139,18 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f image->size().height, Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, image->size().width) ); +#else + /* Centos 5 does not have Cairo::ImageSurface::format_stride_for_width, so just use width * 4 + which I hope is safe (if slow) + */ + Cairo::RefPtr surface = Cairo::ImageSurface::create ( + image->data()[0], + Cairo::FORMAT_ARGB32, + image->size().width, + image->size().height, + image->size().width * 4 + ); +#endif Cairo::RefPtr context = Cairo::Context::create (surface); @@ -86,15 +158,36 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f fc_config = FcConfigCreate (); } - boost::filesystem::path font_file = shared_path () / "LiberationSans-Regular.ttf"; + FontFiles font_files; + + try { + font_files.set (FontFiles::NORMAL, shared_path () / "LiberationSans-Regular.ttf"); + font_files.set (FontFiles::ITALIC, shared_path () / "LiberationSans-Italic.ttf"); + font_files.set (FontFiles::BOLD, shared_path () / "LiberationSans-Bold.ttf"); + } catch (boost::filesystem::filesystem_error& e) { + + } + + /* Hack: try the debian/ubuntu locations if getting the shared path failed */ + + if (!font_files.get(FontFiles::NORMAL) || !boost::filesystem::exists(font_files.get(FontFiles::NORMAL).get())) { + font_files.set (FontFiles::NORMAL, "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"); + } + if (!font_files.get(FontFiles::ITALIC) || !boost::filesystem::exists(font_files.get(FontFiles::ITALIC).get())) { + font_files.set (FontFiles::ITALIC, "/usr/share/fonts/truetype/liberation/LiberationSans-Italic.ttf"); + } + if (!font_files.get(FontFiles::BOLD) || !boost::filesystem::exists(font_files.get(FontFiles::BOLD).get())) { + font_files.set (FontFiles::BOLD, "/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf"); + } + BOOST_FOREACH (shared_ptr i, fonts) { - if (i->id() == subtitle.font() && i->file ()) { - font_file = i->file().get (); + if (i->id() == subtitles.front().font() && i->file(FontFiles::NORMAL)) { + font_files = i->files (); } } - list >::const_iterator existing = fc_config_fonts.begin (); - while (existing != fc_config_fonts.end() && existing->first != font_file) { + list >::const_iterator existing = fc_config_fonts.begin (); + while (existing != fc_config_fonts.end() && existing->first != font_files) { ++existing; } @@ -103,9 +196,16 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f font_name = existing->second; } else { /* Make this font available to DCP-o-matic */ - FcConfigAppFontAddFile (fc_config, reinterpret_cast (font_file.string().c_str ())); + for (int i = 0; i < FontFiles::VARIANTS; ++i) { + if (font_files.get(static_cast(i))) { + FcConfigAppFontAddFile ( + fc_config, + reinterpret_cast (font_files.get(static_cast(i)).get().string().c_str()) + ); + } + } - FcPattern* pattern = FcPatternBuild (0, FC_FILE, FcTypeString, font_file.string().c_str(), static_cast (0)); + FcPattern* pattern = FcPatternBuild (0, FC_FILE, FcTypeString, font_files.get(FontFiles::NORMAL).get().string().c_str(), static_cast (0)); FcObjectSet* object_set = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, static_cast (0)); FcFontSet* font_set = FcFontList (fc_config, pattern, object_set); if (font_set) { @@ -129,7 +229,7 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f FcObjectSetDestroy (object_set); FcPatternDestroy (pattern); - fc_config_fonts.push_back (make_pair (font_file, font_name)); + fc_config_fonts.push_back (make_pair (font_files, font_name)); } FcConfigSetCurrent (fc_config); @@ -143,24 +243,20 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f /* Render the subtitle at the top left-hand corner of image */ Pango::FontDescription font (font_name); - font.set_absolute_size (subtitle.size_in_pixels (target.height) * PANGO_SCALE); - if (subtitle.italic ()) { - font.set_style (Pango::STYLE_ITALIC); - } + font.set_absolute_size (subtitles.front().size_in_pixels (target.height) * PANGO_SCALE); layout->set_font_description (font); - layout->set_text (subtitle.text ()); + layout->set_markup (marked_up (subtitles)); /* Compute fade factor */ /* XXX */ float fade_factor = 1; - layout->update_from_cairo_context (context); - context->scale (xscale, yscale); + layout->update_from_cairo_context (context); - if (subtitle.effect() == dcp::SHADOW) { + if (subtitles.front().effect() == dcp::SHADOW) { /* Drop-shadow effect */ - dcp::Colour const ec = subtitle.effect_colour (); + 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 (4, 4); layout->add_to_cairo_context (context); @@ -169,15 +265,15 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f /* The actual subtitle */ - dcp::Colour const c = subtitle.colour (); + 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->move_to (0, 0); layout->add_to_cairo_context (context); context->fill (); - if (subtitle.effect() == dcp::BORDER) { + if (subtitles.front().effect() == dcp::BORDER) { /* Border effect */ - dcp::Colour ec = subtitle.effect_colour (); + 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); context->move_to (0, 0); layout->add_to_cairo_context (context); @@ -186,49 +282,67 @@ render_subtitle (dcp::SubtitleString const & subtitle, list > f int layout_width; int layout_height; - layout->get_size (layout_width, layout_height); + layout->get_pixel_size (layout_width, layout_height); + layout_width *= xscale; + layout_height *= yscale; int x = 0; - switch (subtitle.h_align ()) { + switch (subtitles.front().h_align ()) { case dcp::HALIGN_LEFT: /* h_position is distance between left of frame and left of subtitle */ - x = subtitle.h_position() * target.width; + x = subtitles.front().h_position() * target.width; break; case dcp::HALIGN_CENTER: /* h_position is distance between centre of frame and centre of subtitle */ - x = (0.5 + subtitle.h_position()) * target.width - layout_width / (PANGO_SCALE * 2); + x = (0.5 + subtitles.front().h_position()) * target.width - layout_width / 2; break; case dcp::HALIGN_RIGHT: /* h_position is distance between right of frame and right of subtitle */ - x = (1.0 - subtitle.h_position()) * target.width - layout_width / PANGO_SCALE; + x = (1.0 - subtitles.front().h_position()) * target.width - layout_width; break; } int y = 0; - switch (subtitle.v_align ()) { + switch (subtitles.front().v_align ()) { case dcp::VALIGN_TOP: - /* v_position is distance between top of frame and top of subtitle */ - y = subtitle.v_position() * target.height; + /* SMPTE says that v_position is the distance between top + of frame and top of subtitle, but this doesn't always seem to be + the case in practice; Gunnar Ásgeirsson's Dolby server appears + to put VALIGN_TOP subs with v_position as the distance between top + of frame and bottom of subtitle. + */ + y = subtitles.front().v_position() * target.height - layout_height; break; case dcp::VALIGN_CENTER: /* v_position is distance between centre of frame and centre of subtitle */ - y = (0.5 + subtitle.v_position()) * target.height - layout_height / (PANGO_SCALE * 2); + y = (0.5 + subtitles.front().v_position()) * target.height - layout_height / 2; break; case dcp::VALIGN_BOTTOM: /* v_position is distance between bottom of frame and bottom of subtitle */ - y = (1.0 - subtitle.v_position()) * target.height - layout_height / PANGO_SCALE; + y = (1.0 - subtitles.front().v_position()) * target.height - layout_height; break; } - return PositionImage (image, Position (x, y)); + return PositionImage (image, Position (max (0, x), max (0, y))); } list render_subtitles (list subtitles, list > fonts, dcp::Size target) { + list pending; list images; + BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) { - images.push_back (render_subtitle (i, fonts, target)); + if (!pending.empty() && fabs (i.v_position() - pending.back().v_position()) > 1e-4) { + images.push_back (render_line (pending, fonts, target)); + pending.clear (); + } + pending.push_back (i); } + + if (!pending.empty ()) { + images.push_back (render_line (pending, fonts, target)); + } + return images; }