Move deinterleaving of audio into ffmpeg decoder.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index e8e73cc9f851688b720a7539ff577db5d2d29a94..30b7dd41f26666bd60672f18da6894c52a4d70ed 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -52,7 +52,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-       Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool, bool);
+       Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
        virtual ~Decoder ();
 
        /* Methods to query our input video */
@@ -80,9 +80,8 @@ public:
        void process_end ();
        void go ();
 
-       /** @return the index of the last video frame to be processed */
-       int video_frame_index () const {
-               return _video_frame_index;
+       SourceFrame video_frame () const {
+               return _video_frame;
        }
 
        virtual std::vector<AudioStream> audio_streams () const {
@@ -94,21 +93,21 @@ public:
        }
 
        /** Emitted when a video frame is ready.
-        *  First parameter is the frame.
+        *  First parameter is the frame within the source.
         *  Second parameter is its index within the content.
         *  Third parameter is either 0 or a subtitle that should be on this frame.
         */
-       boost::signals2::signal<void (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>)> Video;
+       boost::signals2::signal<void (boost::shared_ptr<Image>, SourceFrame, boost::shared_ptr<Subtitle>)> Video;
 
        /** Emitted when some audio data is ready */
-       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>)> Audio;
+       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, int64_t)> Audio;
 
 protected:
        
        virtual PixelFormat pixel_format () const = 0;
        
        void process_video (AVFrame *);
-       void process_audio (uint8_t *, int);
+       void process_audio (boost::shared_ptr<AudioBuffers>);
        void process_subtitle (boost::shared_ptr<TimedSubtitle>);
        void repeat_last_video ();
 
@@ -121,29 +120,17 @@ protected:
        /** associated Job, or 0 */
        Job* _job;
 
-       /** true to do the bare minimum of work; just run through the content.  Useful for acquiring
-        *  accurate frame counts as quickly as possible.  This generates no video or audio output.
-        */
-       bool _minimal;
-
-       /** ignore_length Ignore the content's claimed length when computing progress */
-       bool _ignore_length;
-
 private:
-       void emit_audio (uint8_t* data, int size);
-       
-       /** last video frame to be processed */
-       int _video_frame_index;
+       void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+       void emit_audio (boost::shared_ptr<AudioBuffers>);
 
+       SourceFrame _video_frame;
+       int64_t _audio_frame;
+       
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 
        DelayLine* _delay_line;
-       int _delay_in_bytes;
-
-       /* Number of audio frames that we have pushed to the encoder
-          (at the DCP sample rate).
-       */
-       int64_t _audio_frames_processed;
+       int _delay_in_frames;
 
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;