Fix thinko in video signalling.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index db51879a17d29e74b611d2d1cba0c4562eab966a..805f6e521326bd9902f8b6bcace5495f7335fdcb 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,15 +28,21 @@
 #include <string>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/sigc++.h>
+#include <boost/signals2.hpp>
 #include "util.h"
+#include "stream.h"
+#include "video_source.h"
+#include "audio_source.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.
@@ -45,92 +51,80 @@ class DelayLine;
  *  (by calling ::go), and they emit signals when video or audio data is ready for something else
  *  to process.
  */
-class Decoder
+class Decoder : public VideoSource, public AudioSource
 {
 public:
-       Decoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
-       virtual ~Decoder ();
+       Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       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 */
        virtual Size native_size () const = 0;
-       /** @return number of audio channels */
-       virtual int audio_channels () const = 0;
-       /** @return audio sampling rate in Hz */
-       virtual int audio_sample_rate () const = 0;
-       /** @return format of audio samples */
-       virtual AVSampleFormat audio_sample_format () const = 0;
-
-       void process_begin ();
-       bool pass ();
-       void process_end ();
+
+       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 bool pass () = 0;
        void go ();
 
-       /** @return the index of the last video frame to be processed */
-       int last_video_frame () const {
+       SourceFrame video_frame () const {
                return _video_frame;
        }
+
+       virtual void set_audio_stream (boost::optional<AudioStream>);
+       virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+
+       boost::optional<AudioStream> audio_stream () const {
+               return _audio_stream;
+       }
+
+       boost::optional<SubtitleStream> subtitle_stream () const {
+               return _subtitle_stream;
+       }
+
+       std::vector<AudioStream> audio_streams () const {
+               return _audio_streams;
+       }
        
-       int decoding_frames () const;
-
-       /** Emitted when a video frame is ready.
-        *  First parameter is the frame.
-        *  Second parameter is its index within the content.
-        */
-       sigc::signal<void, boost::shared_ptr<Image>, int> 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;
-       
+       std::vector<SubtitleStream> subtitle_streams () const {
+               return _subtitle_streams;
+       }
+
 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, int);
+       void emit_video (boost::shared_ptr<Image>);
+       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+       void repeat_last_video ();
 
-       /** our FilmState */
-       boost::shared_ptr<const FilmState> _fs;
+       /** 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;
+       boost::optional<AudioStream> _audio_stream;
+       boost::optional<SubtitleStream> _subtitle_stream;
 
-private:
-       void setup_video_filters ();
+       std::vector<AudioStream> _audio_streams;
+       std::vector<SubtitleStream> _subtitle_streams;
        
-       /** last video frame to be processed */
-       int _video_frame;
+private:
+       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+
+       SourceFrame _video_frame;
 
-       AVFilterContext* _buffer_src_context;
-       AVFilterContext* _buffer_sink_context;
+       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
-       bool _have_setup_video_filters;
-       DelayLine* _delay_line;
-       int _delay_in_bytes;
+       boost::shared_ptr<Image> _last_image;
+       boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif