X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=ac1d74c57b39af3aa449e43fd628651108701823;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=902dae2d5e1f113ea8ebdaa0e9e4cb40a30a8779;hpb=d98bdad019ba9be5d800dece0414d7a080609027;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 902dae2d5..ac1d74c57 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ extern "C" {
 }
 #include "util.h"
 #include "config.h"
+#include "cross.h"
 
 class Image;
 class AudioBuffers;
@@ -47,6 +48,7 @@ class EncodedData;
 class Writer;
 class Job;
 class ServerFinder;
+class PlayerVideoFrame;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -55,20 +57,19 @@ class ServerFinder;
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public boost::noncopyable
+class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const 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 f Video frame.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
+	void process_video (boost::shared_ptr<PlayerVideoFrame> f);
 
 	/** Call with some audio data */
 	void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -90,7 +91,7 @@ private:
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<Job> _job;
+	boost::weak_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _state_mutex;
@@ -104,16 +105,14 @@ private:
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-	bool _have_a_real_frame[EYES_COUNT];
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
-	typedef std::list<std::pair<boost::optional<ServerDescription>, boost::thread *> > ThreadList;
-	ThreadList _threads;
+	std::list<boost::thread *> _threads;
 	mutable boost::mutex _mutex;
 	boost::condition _condition;
 
 	boost::shared_ptr<Writer> _writer;
-	boost::shared_ptr<ServerFinder> _server_finder;
+	Waker _waker;
 };
 
 #endif