Remove unused ignore_length parameter.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 7940aed6cdbf71921a48c591f8429ea21ea60900..5750858dfea2efb75c84c0a1cb9df42bc2102eff 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -40,6 +40,7 @@ class DelayLine;
 class TimedSubtitle;
 class Subtitle;
 class Film;
+class FilterGraph;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -51,7 +52,7 @@ class Film;
 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 *, bool);
        virtual ~Decoder ();
 
        /* Methods to query our input video */
@@ -69,14 +70,19 @@ public:
        virtual int64_t audio_channel_layout () const = 0;
        virtual bool has_subtitles () const = 0;
 
+       virtual int time_base_numerator () const = 0;
+       virtual int time_base_denominator () const = 0;
+       virtual int sample_aspect_ratio_numerator () const = 0;
+       virtual int sample_aspect_ratio_denominator () const = 0;
+       
        void process_begin ();
-       bool pass ();
+       virtual bool pass () = 0;
        void process_end ();
        void go ();
 
        /** @return the index of the last video frame to be processed */
-       int last_video_frame () const {
-               return _video_frame;
+       SourceFrame video_frame_index () const {
+               return _video_frame_index;
        }
 
        virtual std::vector<AudioStream> audio_streams () const {
@@ -88,27 +94,23 @@ 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;
-       
+
 protected:
-       /** perform a single pass at our content */
-       virtual bool do_pass () = 0;
+       
        virtual PixelFormat pixel_format () const = 0;
-       virtual int time_base_numerator () const = 0;
-       virtual int time_base_denominator () const = 0;
-       virtual int sample_aspect_ratio_numerator () const = 0;
-       virtual int sample_aspect_ratio_denominator () const = 0;
        
        void process_video (AVFrame *);
        void process_audio (uint8_t *, int);
        void process_subtitle (boost::shared_ptr<TimedSubtitle>);
+       void repeat_last_video ();
 
        int bytes_per_audio_sample () const;
        
@@ -124,20 +126,14 @@ protected:
         */
        bool _minimal;
 
-       /** ignore_length Ignore the content's claimed length when computing progress */
-       bool _ignore_length;
-
 private:
-       void setup_video_filters ();
        void emit_audio (uint8_t* data, int size);
        
        /** last video frame to be processed */
-       int _video_frame;
+       SourceFrame _video_frame_index;
 
-       AVFilterContext* _buffer_src_context;
-       AVFilterContext* _buffer_sink_context;
+       std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 
-       bool _have_setup_video_filters;
        DelayLine* _delay_line;
        int _delay_in_bytes;
 
@@ -147,6 +143,9 @@ private:
        int64_t _audio_frames_processed;
 
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+
+       boost::shared_ptr<Image> _last_image;
+       boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif