X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=9f47bf42562a7255d3071edf9f8144cb438356e6;hb=42410ff820cf885a4b26c24c6c5c9d759dadbf2f;hp=31cf9d97d42e94c400f4e5c1df07da5dbbf91c7b;hpb=e3636952b0d443f61c2966450cc68bc25480dfe2;p=dcpomatic.git

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 31cf9d97d..9f47bf425 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, bool);
+	Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 	virtual ~Decoder ();
 
 	/* Methods to query our input video */
@@ -76,12 +76,11 @@ public:
 	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 video_frame () const {
+	SourceFrame video_frame () const {
 		return _video_frame;
 	}
 
@@ -94,24 +93,23 @@ public:
 	}
 
 	/** 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.
 	 */
-	boost::signals2::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>)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, int64_t)> Audio;
 
 protected:
 	
-	/** perform a single pass at our content */
-	virtual bool do_pass () = 0;
 	virtual PixelFormat pixel_format () const = 0;
 	
 	void process_video (AVFrame *);
 	void process_audio (uint8_t *, int);
 	void process_subtitle (boost::shared_ptr<TimedSubtitle>);
+	void repeat_last_video ();
 
 	int bytes_per_audio_sample () const;
 	
@@ -122,31 +120,22 @@ 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;
-
-	/** ignore_length Ignore the content's claimed length when computing progress */
-	bool _ignore_length;
-
 private:
-	void emit_audio (uint8_t* data, int size);
-	
-	/** 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>);
 
+	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;
+
+	boost::shared_ptr<Image> _last_image;
+	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif