Don't crash if the first packet in a stream has AV_NOPTS_VALUE;

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ce20997c84bcebefdc20dd2f90329155545cc505..69f366aade4e86f0e704a8041d4f781686823ed6 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -42,6 +42,7 @@
 #include "compose.hpp"
 #include "text_content.h"
 #include "audio_content.h"
+#include "frame_interval_checker.h"
 #include <dcp/subtitle_string.h>
 #include <sub/ssa_reader.h>
 #include <sub/subtitle.h>
@@ -126,7 +127,7 @@ FFmpegDecoder::flush ()
        if (video) {
                double const vfr = _ffmpeg_content->video_frame_rate().get();
                Frame const f = full_length.frames_round (vfr);
-               Frame v = video->position(film()).frames_round(vfr) + 1;
+               Frame v = video->position(film()).get_value_or(ContentTime()).frames_round(vfr) + 1;
                while (v < f) {
                        video->emit (film(), shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)), v);
                        ++v;
@@ -377,6 +378,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
                AVSEEK_FLAG_BACKWARD
                );
 
+       {
+               /* Force re-creation of filter graphs to reset them and hence to make sure
+                  they don't have any pre-seek frames knocking about.
+               */
+               boost::mutex::scoped_lock lm (_filter_graphs_mutex);
+               _filter_graphs.clear ();
+       }
+
        if (video_codec_context ()) {
                avcodec_flush_buffers (video_codec_context());
        }
@@ -390,6 +399,10 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
        }
 
        _have_current_subtitle = false;
+
+       BOOST_FOREACH (optional<ContentTime>& i, _next_time) {
+               i = optional<ContentTime>();
+       }
 }
 
 void
@@ -438,12 +451,14 @@ FFmpegDecoder::decode_audio_packet ()
                        shared_ptr<AudioBuffers> data = deinterleave_audio (*stream);
 
                        ContentTime ct;
-                       if (_frame->pts == AV_NOPTS_VALUE && _next_time[stream_index]) {
+                       if (_frame->pts == AV_NOPTS_VALUE) {
                                /* In some streams we see not every frame coming through with a timestamp; for those
                                   that have AV_NOPTS_VALUE we need to work out the timestamp ourselves.  This is
                                   particularly noticeable with TrueHD streams (see #1111).
                                */
-                               ct = *_next_time[stream_index];
+                               if (_next_time[stream_index]) {
+                                       ct = *_next_time[stream_index];
+                               }
                        } else {
                                ct = ContentTime::from_seconds (
                                        av_frame_get_best_effort_timestamp (_frame) *
@@ -616,18 +631,18 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
 #else
        /* Start of the first line in the subtitle */
        uint8_t* sub_p = rect->data[0];
-       /* sub_p looks up into a BGRA palette which is here
-          (i.e. first byte B, second G, third R, fourth A)
+       /* sub_p looks up into a BGRA palette which is at rect->data[1].
+          (first byte B, second G, third R, fourth A)
        */
-       uint32_t const * palette = (uint32_t *) rect->data[1];
 #endif
        /* And the stream has a map of those palette colours to colours
           chosen by the user; created a `mapped' palette from those settings.
        */
        map<RGBA, RGBA> colour_map = ffmpeg_content()->subtitle_stream()->colours ();
        vector<RGBA> mapped_palette (rect->nb_colors);
+       uint8_t const * palette = rect->data[1];
        for (int i = 0; i < rect->nb_colors; ++i) {
-               RGBA c ((palette[i] & 0xff0000) >> 16, (palette[i] & 0xff00) >> 8, palette[i] & 0xff, (palette[i] & 0xff000000) >> 24);
+               RGBA c (palette[2], palette[1], palette[0], palette[3]);
                map<RGBA, RGBA>::const_iterator j = colour_map.find (c);
                if (j != colour_map.end ()) {
                        mapped_palette[i] = j->second;
@@ -638,25 +653,28 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
                        */
                        mapped_palette[i] = c;
                }
+               palette += 4;
        }
 
        /* Start of the output data */
-       uint32_t* out_p = (uint32_t *) image->data()[0];
+       uint8_t* out_p = image->data()[0];
 
        for (int y = 0; y < rect->h; ++y) {
                uint8_t* sub_line_p = sub_p;
-               uint32_t* out_line_p = out_p;
+               uint8_t* out_line_p = out_p;
                for (int x = 0; x < rect->w; ++x) {
                        RGBA const p = mapped_palette[*sub_line_p++];
-                       /* XXX: this seems to be wrong to me (isn't the output image BGRA?) but it looks right on screen */
-                       *out_line_p++ = (p.a << 24) | (p.b << 16) | (p.g << 8) | p.r;
+                       *out_line_p++ = p.b;
+                       *out_line_p++ = p.g;
+                       *out_line_p++ = p.r;
+                       *out_line_p++ = p.a;
                }
 #ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT
                sub_p += rect->pict.linesize[0];
 #else
                sub_p += rect->linesize[0];
 #endif
-               out_p += image->stride()[0] / sizeof (uint32_t);
+               out_p += image->stride()[0];
        }
 
        int target_width = subtitle_codec_context()->width;