X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=fbae07a9a8ebe7cd2a4b20b9f656239631158e6c;hb=1ad291db7e847fbb71e5bd9f2f81db6bfb2a022e;hp=4502b7151dc08c47ba16f7462e629a42521ed897;hpb=15f23b356b757a9697bf1a9ec30c243ab8070404;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 4502b7151..fbae07a9a 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -20,75 +20,63 @@
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-/** @file src/encoder.h
- *  @brief Encoder to J2K and WAV for DCP.
+/** @file  src/encoder.h
+ *  @brief Encoder class.
  */
 
+#include "util.h"
+#include "cross.h"
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.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"
-#include "exceptions.h"
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
-class EncodedData;
 class Writer;
 class Job;
-class ServerFinder;
 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>, 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 f Video frame.
 	 */
-	void process_video (boost::shared_ptr<PlayerVideo> f);
-
-	/** 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;
 
 private:
-	
+
 	void frame_done ();
-	
+
 	void encoder_thread (boost::optional<ServerDescription>);
 	void terminate_threads ();
-	void add_worker_threads (ServerDescription);
-	void server_found (ServerDescription);
+	void servers_list_changed ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
@@ -103,8 +91,10 @@ private:
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
 
-	/** Number of video frames written for the DCP so far */
-	int _video_frames_out;
+	/** Number of video frames enqueued so far */
+	int _video_frames_enqueued;
+	bool _left_done;
+	bool _right_done;
 
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideo> > _queue;
@@ -117,6 +107,10 @@ private:
 
 	boost::shared_ptr<Writer> _writer;
 	Waker _waker;
+
+	boost::shared_ptr<PlayerVideo> _last_player_video;
+
+	boost::signals2::scoped_connection _server_found_connection;
 };
 
 #endif