X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fencoder.h;h=6c465f816773d12635f1b11dd020a807c7a1b756;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=6815fa6f660e6f24261407c2aadd43be081eec45;hpb=21ce34c2cd04a2e7e133ff693b84c054182f4f91;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6815fa6f6..6c465f816 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -36,11 +36,10 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
+#include "config.h"
+#include "cross.h"
 
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
@@ -48,32 +47,32 @@ class DCPVideoFrame;
 class EncodedData;
 class Writer;
 class Job;
+class ServerFinder;
+class DCPVideo;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
  *
- *  Video is supplied to process_video as YUV frames, and audio
+ *  Video is supplied to process_video as RGB frames, and audio
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public VideoSink, public AudioSink
+class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
+	Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
 	void process_begin ();
 
 	/** Call with a frame of video.
-	 *  @param i Video frame image.
-	 *  @param same true if i is the same as the last time we were called.
-	 *  @param s A subtitle that should be on this frame, or 0.
+	 *  @param f Video frame.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time);
+	void process_video (boost::shared_ptr<DCPVideo> f);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
 	void process_end ();
@@ -85,15 +84,17 @@ private:
 	
 	void frame_done ();
 	
-	void encoder_thread (ServerDescription *);
+	void encoder_thread (boost::optional<ServerDescription>);
 	void terminate_threads ();
+	void add_worker_threads (ServerDescription);
+	void server_found (ServerDescription);
 
 	/** Film that we are encoding */
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Job> _job;
+	boost::shared_ptr<const Film> _film;
+	boost::weak_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */
-	mutable boost::mutex _history_mutex;
+	mutable boost::mutex _state_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
 	*/
@@ -104,7 +105,6 @@ private:
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-	bool _have_a_real_frame;
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
 	std::list<boost::thread *> _threads;
@@ -112,6 +112,7 @@ private:
 	boost::condition _condition;
 
 	boost::shared_ptr<Writer> _writer;
+	Waker _waker;
 };
 
 #endif