Add debug option to log SMTP session transcripts.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0334a30e203f4064d8ef4d0ea788eb38d0a2ef2a..5475be6122da98b51c4bb8414a837af46d0be087 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -22,7 +22,6 @@
  */
 
 #include "util.h"
-#include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
@@ -31,14 +30,12 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
-#include <vector>
-#include <string>
 
 class Log;
 class FilterGraph;
+class FFmpegAudioStream;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -47,29 +44,32 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
 
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       void seek (ContentTime time, bool);
        bool pass ();
+       void seek (ContentTime time, bool);
        void flush ();
 
-       AVSampleFormat audio_sample_format () const;
-       int bytes_per_audio_sample () const;
+       AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
+       int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
 
        bool decode_video_packet ();
        void decode_audio_packet ();
        void decode_subtitle_packet ();
 
+       void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+
        void maybe_add_subtitle ();
-       boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
+       boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream, uint8_t** data, int size);
+
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
 
-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
-       
        boost::shared_ptr<Log> _log;
-       
+
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;