using std::cerr;
using std::cout;
-using std::list;
using std::make_pair;
using std::make_shared;
using std::max;
using std::pair;
using std::shared_ptr;
using std::string;
+using std::vector;
using boost::optional;
using namespace dcpomatic;
string
-marked_up (list<StringText> subtitles, int target_height, float fade_factor, string font_name)
+marked_up(vector<StringText> subtitles, int target_height, float fade_factor, string font_name)
{
auto constexpr pixels_to_1024ths_point = 72 * 1024 / 96;
boost::algorithm::replace_all(text, "&", "&");
boost::algorithm::replace_all(text, "<", "<");
boost::algorithm::replace_all(text, ">", ">");
+ boost::algorithm::replace_all(text, "\n", "");
span += text;
span += "</span>";
}
-static string
-setup_font(shared_ptr<const dcpomatic::Font> font)
-{
- auto font_file = default_font_file ();
-
- if (font && font->file()) {
- font_file = *font->file();
- }
-
- return FontConfig::instance()->make_font_available(font_file);
-}
-
-
static float
calculate_fade_factor (StringText const& first, DCPTime time, int frame_rate)
{
struct Layout
{
Position<int> position;
+ int baseline_position;
dcp::Size size;
Glib::RefPtr<Pango::Layout> pango;
+
+ int baseline_to_bottom(int border_width)
+ {
+ return position.y + size.height - baseline_position - border_width;
+ }
};
* at the same time and with the same fade in/out.
*/
static Layout
-setup_layout(list<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
+setup_layout(vector<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
{
DCPOMATIC_ASSERT(!subtitles.empty());
auto const& first = subtitles.front();
- auto const font_name = setup_font(first.font);
+ auto const font_name = FontConfig::instance()->make_font_available(first.font);
auto const fade_factor = calculate_fade_factor(first, time, frame_rate);
auto const markup = marked_up(subtitles, target.height, fade_factor, font_name);
auto layout = create_layout(font_name, markup);
auto ink = layout->get_ink_extents();
- return { { ink.get_x() / Pango::SCALE, ink.get_y() / Pango::SCALE }, { ink.get_width() / Pango::SCALE, ink.get_height() / Pango::SCALE }, layout };
+
+ Layout description;
+ description.position = { ink.get_x() / Pango::SCALE, ink.get_y() / Pango::SCALE };
+ description.baseline_position = layout->get_baseline() / Pango::SCALE;
+ description.size = { ink.get_width() / Pango::SCALE, ink.get_height() / Pango::SCALE };
+ description.pango = layout;
+
+ return description;
+}
+
+
+static
+int
+border_width_for_subtitle(StringText const& subtitle, dcp::Size target)
+{
+ return subtitle.effect() == dcp::Effect::BORDER ? (subtitle.outline_width * target.width / 2048.0) : 0;
}
* at the same time and with the same fade in/out.
*/
static PositionImage
-render_line (list<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
+render_line(vector<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
{
/* XXX: this method can only handle italic / bold changes mid-line,
nothing else yet.
}
}
- auto const border_width = first.effect() == dcp::Effect::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
+ auto const border_width = border_width_for_subtitle(first, target);
layout.size.width += 2 * ceil (border_width);
layout.size.height += 2 * ceil (border_width);
context->stroke ();
int const x = x_position(first.h_align(), first.h_position(), target.width, layout.size.width);
- int const y = y_position(first.valign_standard, first.v_align(), first.v_position(), target.height, layout.position.y, layout.size.height);
+ int const y = y_position(first.valign_standard, first.v_align(), first.v_position(), target.height, layout.baseline_to_bottom(border_width), layout.size.height);
return PositionImage (image, Position<int>(max (0, x), max(0, y)));
}
* @param target Size of the container that this subtitle will end up in.
* @param frame_rate DCP frame rate.
*/
-render_text (list<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
+render_text(vector<StringText> subtitles, dcp::Size target, DCPTime time, int frame_rate)
{
- list<StringText> pending;
-
list<PositionImage> images;
+ vector<StringText> pending;
+
vector<PositionImage> 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, target, time, frame_rate));
- pending.clear ();
+ if (!pending.empty()) {
+ auto const last = pending.back();
+ auto const different_v = i.v_align() != last.v_align() || fabs(i.v_position() - last.v_position()) > 1e-4;
+ auto const different_h = i.h_align() != last.h_align() || fabs(i.h_position() - pending.back().h_position()) > 1e-4;
+ if (different_v || different_h) {
+ /* We need a new line if any new positioning (horizontal or vertical) changes for this section */
+ images.push_back(render_line(pending, target, time, frame_rate));
+ pending.clear ();
+ }
}
pending.push_back (i);
}
}
-list<dcpomatic::Rect<int>>
-bounding_box(list<StringText> subtitles, dcp::Size target, optional<dcp::SubtitleStandard> override_standard)
+vector<dcpomatic::Rect<int>>
+bounding_box(vector<StringText> subtitles, dcp::Size target, optional<dcp::SubtitleStandard> override_standard)
{
- list<StringText> pending;
- list<dcpomatic::Rect<int>> rects;
+ vector<StringText> pending;
+ vector<dcpomatic::Rect<int>> rects;
auto use_pending = [&pending, &rects, target, override_standard]() {
auto const& subtitle = pending.front();
/* We can provide dummy values for time and frame rate here as they are only used to calculate fades */
auto layout = setup_layout(pending, target, DCPTime(), 24);
int const x = x_position(subtitle.h_align(), subtitle.h_position(), target.width, layout.size.width);
- int const y = y_position(standard, subtitle.v_align(), subtitle.v_position(), target.height, layout.position.y, layout.size.height);
+ auto const border_width = border_width_for_subtitle(subtitle, target);
+ int const y = y_position(standard, subtitle.v_align(), subtitle.v_position(), target.height, layout.baseline_to_bottom(border_width), layout.size.height);
rects.push_back({Position<int>(x, y), layout.size.width, layout.size.height});
};
return iter;
}
- auto const font_name = setup_font(subtitle.font);
+ auto const font_name = FontConfig::instance()->make_font_available(subtitle.font);
auto copy = subtitle;
copy.set_text("Qypjg");
auto layout = create_layout(font_name, marked_up({copy}, _target_height, 1, font_name));
}
if (size != other.size) {
- return size < other.size;
+ return size < other.size;
}
return aspect_adjust < other.aspect_adjust;
projects / dcpomatic.git / blobdiff