Fix crashes when using templates in some cases (#2491).

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 663a3c6870cbf2006c70946518e141285f506e29..bd4b74f88395ddfbb9461ffbcfbd515632fac017 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -24,9 +24,10 @@
  */
 
 
+#include "bitmap_text.h"
 #include "decoder.h"
 #include "ffmpeg.h"
-#include "util.h"
+#include "video_filter_graph_set.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
@@ -56,9 +57,12 @@ public:
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       bool flush ();
+       enum class FlushResult {
+               DONE,
+               AGAIN
+       };
 
-       static std::shared_ptr<AudioBuffers> deinterleave_audio (AVFrame* frame);
+       FlushResult flush();
 
        AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
        int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
@@ -72,13 +76,15 @@ private:
        void decode_and_process_audio_packet (AVPacket* packet);
        void decode_and_process_subtitle_packet (AVPacket* packet);
 
-       void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+       BitmapText process_bitmap_subtitle (AVSubtitleRect const * rect);
        void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
        void maybe_add_subtitle ();
 
-       std::list<std::shared_ptr<VideoFilterGraph>> _filter_graphs;
-       boost::mutex _filter_graphs_mutex;
+       FlushResult flush_codecs();
+       FlushResult flush_fill();
+
+       VideoFilterGraphSet _filter_graphs;
 
        dcpomatic::ContentTime _pts_offset;
        boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
@@ -88,4 +94,12 @@ private:
        std::shared_ptr<Image> _black_image;
 
        std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
+
+       enum class FlushState {
+               CODECS,
+               AUDIO_DECODER,
+               FILL,
+       };
+
+       FlushState _flush_state = FlushState::CODECS;
 };