X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=1da5d1c96b6a67d0bc7714fcbdfd29dd9bc89bc3;hb=27867be66579551018c926ed3339624e463c1b08;hp=8d5aa2c405a0c54843b49a30ae24d1bf42ea15aa;hpb=af2dfe1cbabaa3c1fb663063a1f9778858255818;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8d5aa2c40..1da5d1c96 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -24,6 +24,14 @@
  *  @brief Encoder to J2K and WAV for DCP.
  */
 
+#include "util.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+extern "C" {
+#include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
+}
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -31,52 +39,41 @@
 #include <boost/optional.hpp>
 #include <list>
 #include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
 
 class Image;
 class AudioBuffers;
 class Film;
 class ServerDescription;
-class DCPVideoFrame;
+class DCPVideo;
 class EncodedData;
 class Writer;
 class Job;
 class ServerFinder;
-class PlayerVideoFrame;
+class PlayerVideo;
 
 /** @class Encoder
- *  @brief Encoder to J2K and WAV for DCP.
+ *  @brief Class to manage encoding to JPEG2000.
  *
- *  Video is supplied to process_video as RGB frames, and audio
- *  is supplied as uncompressed PCM in blocks of various sizes.
+ *  This class keeps a queue of frames to be encoded and distributes
+ *  the work around threads and encoding servers.
  */
 
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
+	Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
-	void process_begin ();
+	void begin ();
 
 	/** Call with a frame of video.
-	 *  @param pvf Video frame image.
-	 *  @param same true if pvf is the same as the last time we were called.
+	 *  @param f Video frame.
 	 */
-	void process_video (boost::shared_ptr<PlayerVideoFrame> pvf, bool same);
-
-	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>);
+	void enqueue (boost::shared_ptr<PlayerVideo> f);
 
 	/** Called when a processing run has finished */
-	void process_end ();
+	void end ();
 
 	float current_encoding_rate () const;
 	int video_frames_out () const;
@@ -106,9 +103,8 @@ 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;
+	std::list<boost::shared_ptr<DCPVideo> > _queue;
 	std::list<boost::thread *> _threads;
 	mutable boost::mutex _mutex;
 	/** condition to manage thread wakeups when we have nothing to do */