using boost::optional;
using boost::dynamic_pointer_cast;
-TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content)
+TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content, shared_ptr<Log> log)
: TextSubtitle (content)
, _next (0)
{
new SubtitleDecoder (
this,
content->subtitle,
+ log,
bind (&TextSubtitleDecoder::image_subtitles_during, this, _1, _2),
bind (&TextSubtitleDecoder::text_subtitles_during, this, _1, _2)
)
return true;
}
- list<dcp::SubtitleString> out;
-
- /* See if our next subtitle needs to be placed on screen by us */
- bool needs_placement = false;
- BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
- if (!i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
- needs_placement = true;
- }
- }
-
- /* Highest line index in this subtitle */
- int highest = 0;
- BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
- DCPOMATIC_ASSERT (i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
- DCPOMATIC_ASSERT (i.vertical_position.line);
- highest = max (highest, i.vertical_position.line.get());
- }
-
- BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
- BOOST_FOREACH (sub::Block j, i.blocks) {
-
- float v_position;
- dcp::VAlign v_align;
- if (needs_placement) {
- DCPOMATIC_ASSERT (i.vertical_position.line);
- /* This 0.878 is an arbitrary value to lift the bottom sub off the bottom
- of the screen a bit to a pleasing degree.
- */
- v_position = 0.878 + i.vertical_position.line.get() * 1.5 / 22;
- v_align = dcp::VALIGN_BOTTOM;
- } else {
- DCPOMATIC_ASSERT (i.vertical_position.proportional);
- DCPOMATIC_ASSERT (i.vertical_position.reference);
- v_position = i.vertical_position.proportional.get();
- switch (i.vertical_position.reference.get()) {
- case sub::TOP_OF_SCREEN:
- v_align = dcp::VALIGN_TOP;
- break;
- case sub::CENTRE_OF_SCREEN:
- v_align = dcp::VALIGN_CENTER;
- break;
- case sub::BOTTOM_OF_SCREEN:
- v_align = dcp::VALIGN_BOTTOM;
- break;
- default:
- v_align = dcp::VALIGN_TOP;
- break;
- }
- }
-
- out.push_back (
- dcp::SubtitleString (
- TextSubtitleContent::font_id,
- j.italic,
- j.bold,
- /* force the colour to whatever is configured */
- subtitle->content()->colour(),
- j.font_size.points (72 * 11),
- 1.0,
- dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
- dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
- 0,
- dcp::HALIGN_CENTER,
- v_position,
- v_align,
- dcp::DIRECTION_LTR,
- j.text,
- subtitle->content()->outline() ? dcp::BORDER : dcp::NONE,
- subtitle->content()->outline_colour(),
- dcp::Time (0, 1000),
- dcp::Time (0, 1000)
- )
- );
- }
- }
-
- subtitle->give_text (content_time_period (_subtitles[_next]), out);
+ ContentTimePeriod const p = content_time_period (_subtitles[_next]);
+ subtitle->give_text (p, _subtitles[_next]);
+ subtitle->set_position (p.from);
++_next;
return false;
list<ContentTimePeriod> d;
+ /* Only take `during' (not starting) subs if they overlap more than half the requested period;
+ here's the threshold for being significant.
+ */
+ ContentTime const significant (p.duration().get() / 2);
+
for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
ContentTimePeriod t = content_time_period (*i);
- if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
+ if (starting && p.contains(t.from)) {
d.push_back (t);
+ } else if (!starting) {
+ optional<ContentTimePeriod> const o = p.overlap (t);
+ if (o && o->duration() > significant) {
+ d.push_back (t);
+ }
}
}
ContentTime::from_seconds (s.to.all_as_seconds())
);
}
+
+void
+TextSubtitleDecoder::reset ()
+{
+ subtitle->reset ();
+}