X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_encoder.h;h=433a0498f6e32b8f56c80fd66c9844cab1fbca55;hb=de049ab850e4a4e28d70b31a86cb68bc01540773;hp=cea96530960b8febd04da7846a20dd095503b5fa;hpb=b249700e1da7dd6631a8b4440587f4093a2bdef1;p=dcpomatic.git

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index cea965309..433a0498f 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -27,24 +27,24 @@
  *  @brief J2KEncoder class.
  */
 
+#include "grok/context.h"
 
-#include "util.h"
 #include "cross.h"
+#include "dcp_video.h"
+#include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
+#include "writer.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
 #include <list>
 #include <stdint.h>
 
-
-class Film;
 class EncodeServerDescription;
-class DCPVideo;
-class Writer;
+class Film;
 class Job;
 class PlayerVideo;
 
@@ -55,10 +55,10 @@ class PlayerVideo;
  *  This class keeps a queue of frames to be encoded and distributes
  *  the work around threads and encoding servers.
  */
-class J2KEncoder : public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
+class J2KEncoder : public ExceptionStore
 {
 public:
-	J2KEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Writer> writer);
+	J2KEncoder(std::shared_ptr<const Film> film, Writer& writer);
 	~J2KEncoder ();
 
 	J2KEncoder (J2KEncoder const&) = delete;
@@ -70,8 +70,11 @@ public:
 	/** Called to pass a bit of video to be encoded as the next DCP frame */
 	void encode (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
+	void pause();
+	void resume();
+
 	/** Called when a processing run has finished */
-	void end ();
+	void end();
 
 	boost::optional<float> current_encoding_rate () const;
 	int video_frames_enqueued () const;
@@ -80,8 +83,6 @@ public:
 
 private:
 
-	static void call_servers_list_changed (std::weak_ptr<J2KEncoder> encoder);
-
 	void frame_done ();
 
 	void encoder_thread (boost::optional<EncodeServerDescription>);
@@ -96,19 +97,22 @@ private:
 	std::shared_ptr<boost::thread_group> _threads;
 
 	mutable boost::mutex _queue_mutex;
-	std::list<std::shared_ptr<DCPVideo>> _queue;
+	std::list<DCPVideo> _queue;
 	/** condition to manage thread wakeups when we have nothing to do */
 	boost::condition _empty_condition;
 	/** condition to manage thread wakeups when we have too much to do */
 	boost::condition _full_condition;
 
-	std::shared_ptr<Writer> _writer;
+	Writer& _writer;
 	Waker _waker;
 
-	std::shared_ptr<PlayerVideo> _last_player_video[static_cast<int>(Eyes::COUNT)];
+	EnumIndexedVector<std::shared_ptr<PlayerVideo>, Eyes> _last_player_video;
 	boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
 	boost::signals2::scoped_connection _server_found_connection;
+
+	grk_plugin::DcpomaticContext _dcpomatic_context;
+	grk_plugin::GrokContext *_context;
 };