Comment.

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

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 576782d0bd0d290b447a2e7b000d95d0559ea77d..40fe0d28ec5cae2e6bc89d800dd9ef57bb195402 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -30,6 +30,7 @@ extern "C" {
 #include "ffmpeg_subtitle_stream.h"
 #include "util.h"
 #include "safe_stringstream.h"
+#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -134,6 +135,27 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
                        break;
                }
        }
+
+       for (LastSubtitleMap::const_iterator i = _last_subtitle_start.begin(); i != _last_subtitle_start.end(); ++i) {
+               if (i->second) {
+                       i->first->add_subtitle (
+                               ContentTimePeriod (
+                                       i->second.get (),
+                                       ContentTime::from_frames (video_length(), video_frame_rate().get_value_or (24))
+                                       )
+                               );
+               }
+       }
+
+       /* We just added subtitles to our streams without taking the PTS offset into account;
+          this is because we might not know the PTS offset when the first subtitle is seen.
+          Now we know the PTS offset so we can apply it to those subtitles.
+       */
+       if (video_frame_rate()) {
+               BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, _subtitle_streams) {
+                       i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get()));
+               }
+       }
 }
 
 void
@@ -176,14 +198,23 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
        AVSubtitle sub;
        if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
                FFmpegSubtitlePeriod const period = subtitle_period (sub);
-               if (sub.num_rects <= 0 && _last_subtitle_start) {
-                       stream->add_subtitle (ContentTimePeriod (_last_subtitle_start.get (), period.from));
-                       _last_subtitle_start = optional<ContentTime> ();
+               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 */
+                       stream->add_subtitle (ContentTimePeriod (last->second.get (), period.from));
+                       if (sub.num_rects == 0) {
+                               /* This is a `proper' end-of-subtitle */
+                               _last_subtitle_start[stream] = optional<ContentTime> ();
+                       } else {
+                               /* This is just another subtitle, so we start again */
+                               _last_subtitle_start[stream] = period.from;
+                       }
                } else if (sub.num_rects == 1) {
                        if (period.to) {
                                stream->add_subtitle (ContentTimePeriod (period.from, period.to.get ()));
                        } else {
-                               _last_subtitle_start = period.from;
+                               _last_subtitle_start[stream] = period.from;
                        }
                }
                avsubtitle_free (&sub);