X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fencoder.h;h=20f2951b64cbb63ab4d1020ed1a60cba99bb5b6d;hb=8031edf0ce27b75727438e504128448b0884b426;hp=9b1b528bbd305c9c203f4682158127346110b7c9;hpb=b0297f77b23099a52d37becfa45930ee730bda4b;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 9b1b528bb..20f2951b6 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
 class Writer;
 class Job;
@@ -53,16 +53,16 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+	Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
 	void begin ();
 
-	/** Call with a frame of video.
-	 *  @param f Video frame.
+	/** Called to pass in zero or more bits of video to be encoded
+	 *  as the next DCP frame.
 	 */
-	void enqueue (boost::shared_ptr<PlayerVideo> f);
+	void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
 
 	/** Called when a processing run has finished */
 	void end ();
@@ -72,15 +72,15 @@ public:
 
 private:
 
+	void enqueue (boost::shared_ptr<PlayerVideo> f);
 	void frame_done ();
 
-	void encoder_thread (boost::optional<ServerDescription>);
+	void encoder_thread (boost::optional<EncodeServerDescription>);
 	void terminate_threads ();
 	void servers_list_changed ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
 
 	/** Mutex for _time_history and _video_frames_enqueued */
 	mutable boost::mutex _state_mutex;
@@ -90,12 +90,12 @@ private:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-	/** Number of video frames enqueued so far */
-	int _video_frames_enqueued;
-	bool _left_done;
-	bool _right_done;
+	/** Current DCP frame index */
+	Frame _position;
 
-	boost::atomic<bool> _terminate;
+	/* XXX: probably should be atomic */
+	bool _terminate_enqueue;
+	bool _terminate_encoding;
 	/** Mutex for _threads */
 	mutable boost::mutex _threads_mutex;
 	std::list<boost::thread *> _threads;