Be more careful about allowing possibly-trouble-causing characters in DCP filenames.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ddc563b9855b2b5d5fdd7575d69bfbc9475960e9..b6b6e594d9f41055843220706c960dcb6f5756fd 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -98,6 +98,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log>
                        new SubtitleDecoder (
                                this,
                                c->subtitle,
+                               log,
                                bind (&FFmpegDecoder::image_subtitles_during, this, _1, _2),
                                bind (&FFmpegDecoder::text_subtitles_during, this, _1, _2)
                                )
@@ -422,11 +423,9 @@ FFmpegDecoder::decode_audio_packet ()
                        }
 
                        if (ct < ContentTime()) {
-                               LOG_WARNING ("Crazy timestamp %s", to_string (ct));
+                               LOG_WARNING ("Crazy timestamp %1", to_string (ct));
                        }
 
-                       audio->set_position (ct);
-
                        /* Give this data provided there is some, and its time is sane */
                        if (ct >= ContentTime() && data->frames() > 0) {
                                audio->give (*stream, data, ct);
@@ -478,7 +477,6 @@ FFmpegDecoder::decode_video_packet ()
                                shared_ptr<ImageProxy> (new RawImageProxy (image)),
                                llrint (pts * _ffmpeg_content->active_video_frame_rate ())
                                );
-                       video->set_position (ContentTime::from_seconds (pts));
                } else {
                        LOG_WARNING_NC ("Dropping frame without PTS");
                }
@@ -509,14 +507,11 @@ FFmpegDecoder::decode_subtitle_packet ()
        FFmpegSubtitlePeriod sub_period = subtitle_period (sub);
        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];