Fix subtitles (seen in DVB) which have a specified `to' time but

[dcpomatic.git] / src / lib / ffmpeg_examiner.cc

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 2e48810b1ed87779a9bd6e5f53d1df5931cc4a89..271180d5d0970521e58e45f45fa087131abca9d3 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -30,9 +30,7 @@ extern "C" {
 #include "ffmpeg_audio_stream.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "util.h"
-#include "safe_stringstream.h"
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -41,7 +39,6 @@ using std::string;
 using std::cout;
 using std::max;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::optional;
 
 /** @param job job that the examiner is operating in, or 0 */
@@ -82,7 +79,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                                );
 
                } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-                       _subtitle_streams.push_back (boost::make_shared<FFmpegSubtitleStream> (subtitle_stream_name (s), s->id));
+                       _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id)));
                }
        }
 
@@ -239,32 +236,24 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
                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> ();
-                       } 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 ()));
-                               }
+               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 {
-                               _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) {
@@ -353,38 +342,36 @@ FFmpegExaminer::sample_aspect_ratio () const
 string
 FFmpegExaminer::subtitle_stream_name (AVStream* s) const
 {
-       SafeStringStream n;
-
-       n << stream_name (s);
+       string n = stream_name (s);
 
-       if (n.str().empty()) {
-               n << _("unknown");
+       if (n.empty()) {
+               n = _("unknown");
        }
 
-       return n.str ();
+       return n;
 }
 
 string
 FFmpegExaminer::stream_name (AVStream* s) const
 {
-       SafeStringStream n;
+       string n;
 
        if (s->metadata) {
                AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
                if (lang) {
-                       n << lang->value;
+                       n = lang->value;
                }
 
                AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
                if (title) {
-                       if (!n.str().empty()) {
-                               n << " ";
+                       if (!n.empty()) {
+                               n += " ";
                        }
-                       n << title->value;
+                       n += title->value;
                }
        }
 
-       return n.str ();
+       return n;
 }
 
 int