X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_encoder.h;h=4bdedb0604d17ae40cd2f1437c15a407c3e31500;hb=ae11f9e1104cca1f138a09b35fdff20587a8144b;hp=d56fc1aecd19576c15c96525ce77193fff66d9f9;hpb=73ebb92e9df01ba7afb97121b6e2cef6ca13a18e;p=dcpomatic.git

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index d56fc1aec..4bdedb060 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,33 +18,37 @@
 
 */
 
+
 #ifndef DCPOMATIC_J2K_ENCODER_H
 #define DCPOMATIC_J2K_ENCODER_H
 
+
 /** @file  src/j2k_encoder.h
  *  @brief J2KEncoder class.
  */
 
-#include "util.h"
+
 #include "cross.h"
+#include "enum_indexed_vector.h"
 #include "event_history.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 "util.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
-#include <boost/enable_shared_from_this.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 EncodeServerDescription;
+class Film;
 class Job;
 class PlayerVideo;
+class Writer;
+
 
 /** @class J2KEncoder
  *  @brief Class to manage encoding to J2K.
@@ -52,18 +56,20 @@ class PlayerVideo;
  *  This class keeps a queue of frames to be encoded and distributes
  *  the work around threads and encoding servers.
  */
-
-class J2KEncoder : public boost::noncopyable, public ExceptionStore, public boost::enable_shared_from_this<J2KEncoder>
+class J2KEncoder : public ExceptionStore, public std::enable_shared_from_this<J2KEncoder>
 {
 public:
-	J2KEncoder (boost::shared_ptr<const Film> film, boost::shared_ptr<Writer> writer);
+	J2KEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Writer> writer);
 	~J2KEncoder ();
 
+	J2KEncoder (J2KEncoder const&) = delete;
+	J2KEncoder& operator= (J2KEncoder const&) = delete;
+
 	/** Called to indicate that a processing run is about to begin */
 	void begin ();
 
 	/** Called to pass a bit of video to be encoded as the next DCP frame */
-	void encode (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+	void encode (std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
 	/** Called when a processing run has finished */
 	void end ();
@@ -75,7 +81,7 @@ public:
 
 private:
 
-	static void call_servers_list_changed (boost::weak_ptr<J2KEncoder> encoder);
+	static void call_servers_list_changed (std::weak_ptr<J2KEncoder> encoder);
 
 	void frame_done ();
 
@@ -83,26 +89,28 @@ private:
 	void terminate_threads ();
 
 	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
+	std::shared_ptr<const Film> _film;
 
 	EventHistory _history;
 
-	boost::shared_ptr<boost::thread_group> _threads;
+	boost::mutex _threads_mutex;
+	std::shared_ptr<boost::thread_group> _threads;
 
 	mutable boost::mutex _queue_mutex;
-	std::list<boost::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;
 
-	boost::shared_ptr<Writer> _writer;
+	std::shared_ptr<Writer> _writer;
 	Waker _waker;
 
-	boost::shared_ptr<PlayerVideo> _last_player_video[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;
 };
 
+
 #endif