Partial fix to sync according to pts.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 792f7dde2ea948c5046afb18cd855f29da89d331..7559217eb13f914a2acd4f68a5b1407c6893705e 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -29,12 +29,8 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <sigc++/sigc++.h>
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
-#include <libswresample/swresample.h>
-}
-#endif
 #include "util.h"
+#include "stream.h"
 
 class Job;
 class FilmState;
@@ -42,6 +38,8 @@ class Options;
 class Image;
 class Log;
 class DelayLine;
+class TimedSubtitle;
+class Subtitle;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -71,6 +69,12 @@ public:
        /** @return format of audio samples */
        virtual AVSampleFormat audio_sample_format () const = 0;
        virtual int64_t audio_channel_layout () const = 0;
+       virtual bool has_subtitles () const = 0;
+
+       /** @return amount of extra unwanted audio at the start (or -ve for unwanted video) in milliseconds */
+       virtual int audio_to_discard () const {
+               return 0;
+       }
 
        void process_begin ();
        bool pass ();
@@ -81,20 +85,24 @@ public:
        int last_video_frame () const {
                return _video_frame;
        }
+
+       virtual std::vector<AudioStream> audio_streams () const {
+               return std::vector<AudioStream> ();
+       }
        
-       int decoding_frames () const;
+       virtual std::vector<SubtitleStream> subtitle_streams () const {
+               return std::vector<SubtitleStream> ();
+       }
 
        /** Emitted when a video frame is ready.
         *  First parameter is the frame.
         *  Second parameter is its index within the content.
+        *  Third parameter is either 0 or a subtitle that should be on this frame.
         */
-       sigc::signal<void, boost::shared_ptr<Image>, int> Video;
+       sigc::signal<void, boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle> > Video;
 
-       /** Emitted when some audio data is ready.
-        *  First parameter is the interleaved sample data, format is given in the FilmState.
-        *  Second parameter is the size of the data.
-        */
-       sigc::signal<void, uint8_t *, int> Audio;
+       /** Emitted when some audio data is ready */
+       sigc::signal<void, boost::shared_ptr<AudioBuffers> > Audio;
        
 protected:
        /** perform a single pass at our content */
@@ -107,6 +115,7 @@ protected:
        
        void process_video (AVFrame *);
        void process_audio (uint8_t *, int);
+       void process_subtitle (boost::shared_ptr<TimedSubtitle>);
 
        /** our FilmState */
        boost::shared_ptr<const FilmState> _fs;
@@ -127,6 +136,8 @@ protected:
 
 private:
        void setup_video_filters ();
+       void emit_audio (uint8_t* data, int size);
+       int bytes_per_audio_sample () const;
        
        /** last video frame to be processed */
        int _video_frame;
@@ -134,10 +145,6 @@ private:
        AVFilterContext* _buffer_src_context;
        AVFilterContext* _buffer_sink_context;
 
-#if HAVE_SWRESAMPLE    
-       SwrContext* _swr_context;
-#endif 
-
        bool _have_setup_video_filters;
        DelayLine* _delay_line;
        int _delay_in_bytes;
@@ -145,7 +152,9 @@ private:
        /* Number of audio frames that we have pushed to the encoder
           (at the DCP sample rate).
        */
-       int _audio_frames_processed;
+       int64_t _audio_frames_processed;
+
+       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 };
 
 #endif