static list<pair<FontFiles, string> > fc_config_fonts;
string
-marked_up (list<dcp::SubtitleString> subtitles)
+marked_up (list<SubtitleString> subtitles)
{
string out;
bool italic = false;
bool bold = false;
bool underline = false;
- BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
+ BOOST_FOREACH (SubtitleString const & i, subtitles) {
+
if (i.italic() && !italic) {
out += "<i>";
}
if (i.underline() && !underline) {
out += "<u>";
}
-
- out += i.text ();
-
if (!i.underline() && underline) {
out += "</u>";
}
italic = i.italic ();
bold = i.bold ();
underline = i.underline ();
+
+ out += i.text ();
}
if (underline) {
return out;
}
-/** @param subtitles A list of subtitles that are all on the same line */
+/** @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<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target)
+render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time)
{
/* XXX: this method can only handle italic / bold changes mid-line,
nothing else yet.
}
}
- FcPattern* pattern = FcPatternBuild (0, FC_FILE, FcTypeString, font_files.get(FontFiles::NORMAL).get().string().c_str(), static_cast<char *> (0));
+ FcPattern* pattern = FcPatternBuild (
+ 0, FC_FILE, FcTypeString, font_files.get(FontFiles::NORMAL).get().string().c_str(), static_cast<char *> (0)
+ );
FcObjectSet* object_set = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_LANG, FC_FILE, static_cast<char *> (0));
FcFontSet* font_set = FcFontList (fc_config, pattern, object_set);
if (font_set) {
layout->set_markup (marked_up (subtitles));
/* Compute fade factor */
- /* XXX */
float fade_factor = 1;
+ DCPTime const fade_in_start = DCPTime::from_seconds (subtitles.front().in().as_seconds ());
+ DCPTime const fade_in_end = fade_in_start + DCPTime::from_seconds (subtitles.front().fade_up_time().as_seconds ());
+ DCPTime const fade_out_end = DCPTime::from_seconds (subtitles.front().out().as_seconds ());
+ DCPTime const fade_out_start = fade_out_end - DCPTime::from_seconds (subtitles.front().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();
+ } 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;
+ }
+
context->scale (xscale, yscale);
layout->update_from_cairo_context (context);
+ /* Shuffle the subtitle over very slightly if it has a border so that the left-hand
+ 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;
+
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 (4, 4);
+ context->move_to (x_offset + 4, 4);
layout->add_to_cairo_context (context);
context->fill ();
}
- /* 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->move_to (0, 0);
- layout->add_to_cairo_context (context);
- context->fill ();
-
if (subtitles.front().effect() == dcp::BORDER) {
- /* Border effect */
+ /* 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);
- context->move_to (0, 0);
+ 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);
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 ();
+
int layout_width;
int layout_height;
layout->get_pixel_size (layout_width, layout_height);
return PositionImage (image, Position<int> (max (0, x), max (0, y)));
}
+/** @param time Time of the frame that these subtitles are going on */
list<PositionImage>
-render_subtitles (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target)
+render_subtitles (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time)
{
- list<dcp::SubtitleString> pending;
+ list<SubtitleString> pending;
list<PositionImage> images;
- BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
+ BOOST_FOREACH (SubtitleString const & i, subtitles) {
if (!pending.empty() && fabs (i.v_position() - pending.back().v_position()) > 1e-4) {
- images.push_back (render_line (pending, fonts, target));
+ images.push_back (render_line (pending, fonts, target, time));
pending.clear ();
}
pending.push_back (i);
}
if (!pending.empty ()) {
- images.push_back (render_line (pending, fonts, target));
+ images.push_back (render_line (pending, fonts, target, time));
}
return images;