X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=30b7dd41f26666bd60672f18da6894c52a4d70ed;hb=f89ef49deefe91e2b1972b54ee07bfc22a22f303;hp=312cbbe8e06b8e791d06ea999cc2555a2422f4f3;hpb=4dfce74792c3ea55ecf2479568f76d7e54b826e0;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 312cbbe8e..30b7dd41f 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,18 +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.
@@ -51,13 +52,11 @@ class Subtitle;
 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 *);
 	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 */
@@ -71,89 +70,72 @@ 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 {
+	SourceFrame video_frame () const {
 		return _video_frame;
 	}
 
-	virtual std::vector<Stream> audio_streams () const {
-		return std::vector<Stream> ();
+	virtual std::vector<AudioStream> audio_streams () const {
+		return std::vector<AudioStream> ();
 	}
 	
-	virtual std::vector<Stream> subtitle_streams () const {
-		return std::vector<Stream> ();
+	virtual std::vector<SubtitleStream> subtitle_streams () const {
+		return std::vector<SubtitleStream> ();
 	}
 
-	virtual void set_audio_stream (Stream s) {}
-	virtual void set_subtitle_stream (Stream s) {}
-	
 	/** 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, 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>, int64_t)> 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;
 	
 	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 ();
 
-	/** 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 ();
-	
-	/** last video frame to be processed */
-	int _video_frame;
+	void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+	void emit_audio (boost::shared_ptr<AudioBuffers>);
 
-	AVFilterContext* _buffer_src_context;
-	AVFilterContext* _buffer_sink_context;
+	SourceFrame _video_frame;
+	int64_t _audio_frame;
+	
+	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 
-	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;
+	int _delay_in_frames;
 
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+
+	boost::shared_ptr<Image> _last_image;
+	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif