Remove unused ignore_length parameter.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 08d96123380701e94f5ece131c6d3e54cf5321ad..5750858dfea2efb75c84c0a1cb9df42bc2102eff 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,15 +28,19 @@
 #include <string>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/sigc++.h>
+#include <boost/signals2.hpp>
 #include "util.h"
+#include "stream.h"
 
 class Job;
-class FilmState;
 class Options;
 class Image;
 class Log;
 class DelayLine;
+class TimedSubtitle;
+class Subtitle;
+class Film;
+class FilterGraph;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -48,13 +52,11 @@ class DelayLine;
 class Decoder
 {
 public:
-       Decoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+       Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool);
        virtual ~Decoder ();
 
        /* Methods to query our input video */
 
-       /** @return length in video frames */
-       virtual int length_in_frames () const = 0;
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */
@@ -66,71 +68,72 @@ 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;
 
+       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 {
+               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.
+        *  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.
         */
-       sigc::signal<void, boost::shared_ptr<Image>, int> 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;
 
-       /** 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;
-       
 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;
-       virtual void overlay (boost::shared_ptr<Image> image) const {}
        
        void process_video (AVFrame *);
        void process_audio (uint8_t *, int);
+       void process_subtitle (boost::shared_ptr<TimedSubtitle>);
+       void repeat_last_video ();
 
-       /** our FilmState */
-       boost::shared_ptr<const FilmState> _fs;
+       int bytes_per_audio_sample () const;
+       
+       /** our Film */
+       boost::shared_ptr<Film> _film;
        /** our options */
        boost::shared_ptr<const Options> _opt;
        /** associated Job, or 0 */
        Job* _job;
-       /** log that we can write to */
-       Log* _log;
 
        /** 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 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;
 
@@ -138,6 +141,11 @@ private:
           (at the DCP sample rate).
        */
        int64_t _audio_frames_processed;
+
+       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+
+       boost::shared_ptr<Image> _last_image;
+       boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif