Various fixes to PTS mangling.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 8f0482aad8331dcd12685e1d4724e08469b20eb8..73edcccb43ec562162825f4e82b3331d9abceaa6 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -35,6 +35,7 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "subtitle_decoder.h"
 #include "ffmpeg.h"
 
 class Film;
@@ -43,15 +44,14 @@ class ffmpeg_pts_offset_test;
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public FFmpeg
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
        FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
        ~FFmpegDecoder ();
 
        void pass ();
-       void seek (VideoContent::Frame);
-       void seek_back ();
+       void seek (VideoContent::Frame, bool);
        bool done () const;
 
 private:
@@ -67,10 +67,10 @@ private:
 
        AVSampleFormat audio_sample_format () const;
        int bytes_per_audio_sample () const;
-       void do_seek (VideoContent::Frame, bool, bool);
 
        bool decode_video_packet ();
        void decode_audio_packet ();
+       void decode_subtitle_packet ();
 
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
@@ -84,5 +84,7 @@ private:
        bool _decode_video;
        bool _decode_audio;
 
-       double _pts_offset;
+       double _video_pts_offset;
+       double _audio_pts_offset;
+       bool _just_sought;
 };