X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=e757e5401aaef804d7407c92e4536a3de3213cb6;hb=88e187267df754a99dba3222a94e01362986f720;hp=198dfb8dcb6d1ccd0cb2f52fc5119aa6d785e981;hpb=4928ece9b10df775ab3003c024f52bdd30d8f591;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 198dfb8dc..e757e5401 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -28,120 +28,44 @@
 #include <string>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/sigc++.h>
-extern "C" {
-#include <libswresample/swresample.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.
  *
- *  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>, boost::shared_ptr<const Options>, Job *);
+	virtual ~Decoder () {}
 
-	/* Methods to query our input video */
+	virtual bool pass () = 0;
 
-	/** @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;
-
-	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;
-	}
-	
-	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;
-	
 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);
-
-	/** 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;
-
-private:
-	void setup_video_filters ();
-	
-	/** last video frame to be processed */
-	int _video_frame;
-
-	AVFilterContext* _buffer_src_context;
-	AVFilterContext* _buffer_sink_context;
-
-	SwrContext* _swr_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).
-	*/
-	int _audio_frames_processed;
 };
 
 #endif