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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 5750858df..30b7dd41f 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -52,7 +52,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool);
+	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 	virtual ~Decoder ();
 
 	/* Methods to query our input video */
@@ -80,9 +80,8 @@ public:
 	void process_end ();
 	void go ();
 
-	/** @return the index of the last video frame to be processed */
-	SourceFrame video_frame_index () const {
-		return _video_frame_index;
+	SourceFrame video_frame () const {
+		return _video_frame;
 	}
 
 	virtual std::vector<AudioStream> audio_streams () const {
@@ -101,14 +100,14 @@ public:
 	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;
+	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, int64_t)> Audio;
 
 protected:
 	
 	virtual PixelFormat pixel_format () 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 ();
 
@@ -121,26 +120,17 @@ protected:
 	/** associated Job, or 0 */
 	Job* _job;
 
-	/** 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;
-
 private:
-	void emit_audio (uint8_t* data, int size);
-	
-	/** last video frame to be processed */
-	SourceFrame _video_frame_index;
+	void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+	void emit_audio (boost::shared_ptr<AudioBuffers>);
 
+	SourceFrame _video_frame;
+	int64_t _audio_frame;
+	
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 
 	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;