X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=cc4c87373616e6f4f469e4f3ce9018b4ee5aa929;hb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;hp=e81fbb24ec5ea4d43544222b963054fecb144d13;hpb=71b7808830e17423453502ed5112b70bf90fff1b;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index e81fbb24e..cc4c87373 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,129 +28,53 @@
 #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"
+#include "film.h"
+#include "options.h"
 
 class Job;
-class FilmState;
-class Options;
 class Image;
 class Log;
 class DelayLine;
 class TimedSubtitle;
 class Subtitle;
+class FilterGraph;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
  *
- *  These classes can be instructed run through their content
- *  (by calling ::go), and they emit signals when video or audio data is ready for something else
- *  to process.
+ *  These classes can be instructed run through their content (by
+ *  calling ::go), and they emit signals when video or audio data is
+ *  ready for something else to process.
  */
 class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
-	virtual ~Decoder ();
+	Decoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	virtual ~Decoder () {}
 
-	/* Methods to query our input video */
+	virtual bool pass () = 0;
+	virtual bool seek (double);
+	virtual bool seek_to_last ();
 
-	/** @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;
-	virtual int64_t audio_channel_layout () const = 0;
-	virtual bool has_subtitles () const = 0;
+	boost::signals2::signal<void()> OutputChanged;
 
-	void process_begin ();
-	bool pass ();
-	void process_end ();
-	void go ();
-
-	/** @return the index of the last video frame to be processed */
-	int last_video_frame () const {
-		return _video_frame;
-	}
-
-	virtual std::vector<AudioStream> audio_streams () const {
-		return std::vector<AudioStream> ();
-	}
-	
-	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, boost::shared_ptr<Subtitle> > Video;
-
-	/** Emitted when some audio data is ready */
-	sigc::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>);
-
-	int bytes_per_audio_sample () const;
-	
-	/** our FilmState */
-	boost::shared_ptr<const FilmState> _fs;
-	/** our options */
-	boost::shared_ptr<const Options> _opt;
+	/** our Film */
+	boost::shared_ptr<Film> _film;
+	/** our decode options */
+	DecodeOptions _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);
+	virtual void film_changed (Film::Property) {}
 	
-	/** last video frame to be processed */
-	int _video_frame;
-
-	AVFilterContext* _buffer_src_context;
-	AVFilterContext* _buffer_sink_context;
-
-	bool _have_setup_video_filters;
-	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;
-
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+	boost::signals2::scoped_connection _film_connection;
 };
 
 #endif