/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
Decoder* parent,
shared_ptr<const SubtitleContent> c,
shared_ptr<Log> log,
- function<list<ContentTimePeriod> (ContentTimePeriod, bool)> image_during,
- function<list<ContentTimePeriod> (ContentTimePeriod, bool)> text_during
+ ContentTime first
)
: DecoderPart (parent, log)
, _content (c)
- , _image_during (image_during)
- , _text_during (text_during)
+ , _position (first)
{
}
-/** Called by subclasses when an image subtitle is ready.
- * @param period Period of the subtitle.
+/** Called by subclasses when an image subtitle is starting.
+ * @param from From time of the subtitle.
* @param image Subtitle image.
* @param rect Area expressed as a fraction of the video frame that this subtitle
* is for (e.g. a width of 0.5 means the width of the subtitle is half the width
* of the video frame)
*/
void
-SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
+SubtitleDecoder::emit_image_start (ContentTime from, shared_ptr<Image> image, dcpomatic::Rect<double> rect)
{
- _decoded_image.push_back (ContentImageSubtitle (period, image, rect));
+ ImageStart (ContentImageSubtitle (from, image, rect));
+ _position = from;
}
void
-SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
+SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
{
- /* We must escape < and > in strings, otherwise they might confuse our subtitle
- renderer (which uses some HTML-esque markup to do bold/italic etc.)
- */
BOOST_FOREACH (dcp::SubtitleString& i, s) {
+ /* We must escape < and > in strings, otherwise they might confuse our subtitle
+ renderer (which uses some HTML-esque markup to do bold/italic etc.)
+ */
string t = i.text ();
boost::algorithm::replace_all (t, "<", "<");
boost::algorithm::replace_all (t, ">", ">");
i.set_text (t);
- }
-
- _decoded_text.push_back (ContentTextSubtitle (period, s));
-}
-
-/** Get the subtitles that correspond to a given list of periods.
- * @param subs Subtitles.
- * @param sp Periods for which to extract subtitles from subs.
- */
-template <class T>
-list<T>
-SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool accurate)
-{
- if (sp.empty ()) {
- return list<T> ();
- }
- /* Find the time of the first subtitle we don't have in subs */
- optional<ContentTime> missing;
- BOOST_FOREACH (ContentTimePeriod i, sp) {
- typename list<T>::const_iterator j = subs.begin();
- while (j != subs.end() && j->period() != i) {
- ++j;
+ /* Set any forced appearance */
+ if (content()->colour()) {
+ i.set_colour (*content()->colour());
}
- if (j == subs.end ()) {
- missing = i.from;
+ if (content()->effect_colour()) {
+ i.set_effect_colour (*content()->effect_colour());
}
- }
-
- /* Suggest to our parent decoder that it might want to seek if we haven't got what we're being asked for */
- if (missing) {
- _log->log (String::compose ("SD suggests seek to %1", to_string (*missing)), LogEntry::TYPE_DEBUG_DECODE);
- maybe_seek (*missing, true);
- }
-
- /* Now enough pass() calls will either:
- * (a) give us what we want, or
- * (b) hit the end of the decoder.
- */
- while (!_parent->pass(Decoder::PASS_REASON_SUBTITLE, accurate) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
-
- /* Now look for what we wanted in the data we have collected */
- /* XXX: inefficient */
-
- list<T> out;
- BOOST_FOREACH (ContentTimePeriod i, sp) {
- typename list<T>::const_iterator j = subs.begin();
- while (j != subs.end() && j->period() != i) {
- ++j;
+ if (content()->effect()) {
+ i.set_effect (*content()->effect());
}
- if (j != subs.end()) {
- out.push_back (*j);
+ if (content()->fade_in()) {
+ i.set_fade_up_time (dcp::Time(content()->fade_in()->seconds(), 1000));
}
- }
-
- /* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */
-
- list<ContentImageSubtitle>::iterator i = _decoded_image.begin();
- while (i != _decoded_image.end()) {
- list<ContentImageSubtitle>::iterator tmp = i;
- ++tmp;
-
- if (
- i->period().to < (period.from - ContentTime::from_seconds (5)) ||
- i->period().from > (period.to + ContentTime::from_seconds (5))
- ) {
- _decoded_image.erase (i);
+ if (content()->fade_out()) {
+ i.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000));
}
-
- i = tmp;
}
- return out;
-}
-
-list<ContentTextSubtitle>
-SubtitleDecoder::get_text (ContentTimePeriod period, bool starting, bool accurate)
-{
- return get<ContentTextSubtitle> (_decoded_text, _text_during (period, starting), period, accurate);
-}
-
-list<ContentImageSubtitle>
-SubtitleDecoder::get_image (ContentTimePeriod period, bool starting, bool accurate)
-{
- return get<ContentImageSubtitle> (_decoded_image, _image_during (period, starting), period, accurate);
+ TextStart (ContentTextSubtitle (from, s));
+ _position = from;
}
void
-SubtitleDecoder::seek (ContentTime t, bool)
+SubtitleDecoder::emit_text_start (ContentTime from, sub::Subtitle const & subtitle)
{
- _log->log (String::compose ("SD seek to %1", to_string(t)), LogEntry::TYPE_DEBUG_DECODE);
- reset ();
-}
-
-void
-SubtitleDecoder::reset ()
-{
- _decoded_text.clear ();
- _decoded_image.clear ();
-}
-
-void
-SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subtitle)
-{
- /* See if our next subtitle needs to be placed on screen by us */
+ /* See if our next subtitle needs to be vertically placed on screen by us */
bool needs_placement = false;
optional<int> bottom_line;
BOOST_FOREACH (sub::Line i, subtitle.lines) {
case sub::TOP_OF_SCREEN:
v_align = dcp::VALIGN_TOP;
break;
- case sub::CENTRE_OF_SCREEN:
+ case sub::VERTICAL_CENTRE_OF_SCREEN:
v_align = dcp::VALIGN_CENTER;
break;
case sub::BOTTOM_OF_SCREEN:
}
}
- dcp::Effect effect = dcp::NONE;
- if (content()->outline()) {
- effect = dcp::BORDER;
- } else if (content()->shadow()) {
- effect = dcp::SHADOW;
+ dcp::HAlign h_align;
+ switch (i.horizontal_position.reference) {
+ case sub::LEFT_OF_SCREEN:
+ h_align = dcp::HALIGN_LEFT;
+ break;
+ case sub::HORIZONTAL_CENTRE_OF_SCREEN:
+ h_align = dcp::HALIGN_CENTER;
+ break;
+ case sub::RIGHT_OF_SCREEN:
+ h_align = dcp::HALIGN_RIGHT;
+ break;
+ default:
+ h_align = dcp::HALIGN_CENTER;
+ break;
}
+ /* The idea here (rightly or wrongly) is that we set the appearance based on the
+ values in the libsub objects, and these are overridden with values from the
+ content by the other emit_text_start() above.
+ */
+
out.push_back (
dcp::SubtitleString (
string(TEXT_FONT_ID),
j.italic,
j.bold,
j.underline,
- /* force the colour to whatever is configured */
- content()->colour(),
+ j.colour.dcp(),
j.font_size.points (72 * 11),
1.0,
- dcp::Time (period.from.seconds(), 1000),
- dcp::Time (period.to.seconds(), 1000),
- 0,
- dcp::HALIGN_CENTER,
+ dcp::Time (from.seconds(), 1000),
+ /* XXX: hmm; this is a bit ugly (we don't know the to time yet) */
+ dcp::Time (),
+ i.horizontal_position.proportional,
+ h_align,
v_position,
v_align,
dcp::DIRECTION_LTR,
j.text,
- effect,
- content()->effect_colour(),
- dcp::Time (content()->fade_in().seconds(), 1000),
- dcp::Time (content()->fade_out().seconds(), 1000)
+ dcp::NONE,
+ j.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
+ /* Hack: we should use subtitle.fade_up and subtitle.fade_down here
+ but the times of these often don't have a frame rate associated
+ with them so the sub::Time won't convert them to milliseconds without
+ throwing an exception. Since only DCP subs fill those in (and we don't
+ use libsub for DCP subs) we can cheat by just putting 0 in here.
+ */
+ dcp::Time (),
+ dcp::Time ()
)
);
}
}
- give_text (period, out);
+ emit_text_start (from, out);
+}
+
+void
+SubtitleDecoder::emit_stop (ContentTime to)
+{
+ Stop (to);
+}
+
+void
+SubtitleDecoder::emit_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
+{
+ emit_text_start (period.from, s);
+ emit_stop (period.to);
+}
+
+void
+SubtitleDecoder::emit_text (ContentTimePeriod period, sub::Subtitle const & s)
+{
+ emit_text_start (period.from, s);
+ emit_stop (period.to);
+}
+
+void
+SubtitleDecoder::seek ()
+{
+ _position = ContentTime ();
}
projects / dcpomatic.git / blobdiff