ContentTimePeriod period;
period.from = sub_period.from + _pts_offset;
subtitle->set_position (period.from);
- if (sub_period.to) {
- /* We already know the subtitle period `to' time */
- period.to = sub_period.to.get() + _pts_offset;
- } else {
- /* We have to look up the `to' time in the stream's records */
- period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
- }
+ /* We can't trust the `to' time from sub_period as there are some decoders which
+ give a sub_period time for `to' which is subsequently overridden by a `stop' subtitle;
+ see also FFmpegExaminer.
+ */
+ period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
for (unsigned int i = 0; i < sub.num_rects; ++i) {
AVSubtitleRect const * rect = sub.rects[i];
FFmpegSubtitlePeriod const period = subtitle_period (sub);
bool const starts_image = subtitle_starts_image (sub);
+ /* Some streams (notably DVB streams) have subtitles which have a specified end time
+ but which are then stopped earlier than this by a zero-num_rect subtitle.
+ */
+
LastSubtitleMap::iterator last = _last_subtitle_start.find (stream);
- if (last != _last_subtitle_start.end() && last->second) {
- /* We have seen the start of a subtitle but not yet the end. Whatever this is
- finishes the previous subtitle, so add it */
- if (last->second->image) {
- stream->add_image_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
- } else {
- stream->add_text_subtitle (last->second->id, ContentTimePeriod (last->second->time, period.from));
- }
- if (sub.num_rects == 0) {
- /* This is a `proper' end-of-subtitle */
- _last_subtitle_start[stream] = optional<SubtitleStart> ();
+ if (sub.num_rects == 0 && last != _last_subtitle_start.end() && last->second) {
+ /* Set (or fix) the `to' time for the last subtitle */
+ stream->set_subtitle_to (last->second->id, period.from);
+ _last_subtitle_start[stream] = optional<SubtitleStart> ();
+ } else if (sub.num_rects > 0) {
+ /* Add a subtitle; if we don't know the `to' time we set it to the from time and fix it later */
+ if (starts_image) {
+ stream->add_image_subtitle (id, ContentTimePeriod (period.from, period.to.get_value_or (period.from)));
} else {
- /* This is just another subtitle, so we start again */
- _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
- }
- } else if (sub.num_rects >= 1) {
- if (period.to) {
- if (starts_image) {
- stream->add_image_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
- } else {
- stream->add_text_subtitle (id, ContentTimePeriod (period.from, period.to.get ()));
- }
- } else {
- _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
+ stream->add_text_subtitle (id, ContentTimePeriod (period.from, period.to.get_value_or (period.from)));
}
+
+ _last_subtitle_start[stream] = SubtitleStart (id, starts_image, period.from);
}
for (unsigned int i = 0; i < sub.num_rects; ++i) {
void add_image_subtitle (std::string id, ContentTimePeriod period);
void add_text_subtitle (std::string id, ContentTimePeriod period);
+ void set_subtitle_to (std::string id, ContentTime to);
std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const;
std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const;
ContentTime find_subtitle_to (std::string id) const;