Create a single DcpomaticContext for all GrokContexts, rather than copying them.

[dcpomatic.git] / src / lib / j2k_encoder.h

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index a52cf0d1fc44f264bc614b33877d32a1d79b981a..913beb5a91b5e0e9eb8bb8b5281b8bc021d0bdea 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -29,9 +29,14 @@
 
 
 #include "cross.h"
+#include "enum_indexed_vector.h"
 #include "event_history.h"
 #include "exception_store.h"
-#include "util.h"
+#ifdef DCPOMATIC_GROK
+#include "grok/context.h"
+#endif
+#include "j2k_encoder_thread.h"
+#include "writer.h"
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -46,7 +51,10 @@ class EncodeServerDescription;
 class Film;
 class Job;
 class PlayerVideo;
-class Writer;
+
+struct local_threads_created_and_destroyed;
+struct remote_threads_created_and_destroyed;
+struct frames_not_lost_when_threads_disappear;
 
 
 /** @class J2KEncoder
@@ -55,10 +63,10 @@ class Writer;
  *  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,21 +78,27 @@ 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;
 
-       void servers_list_changed ();
+       DCPVideo pop();
+       void retry(DCPVideo frame);
+       void write(std::shared_ptr<const dcp::Data> data, int index, Eyes eyes);
 
 private:
-
-       static void call_servers_list_changed (std::weak_ptr<J2KEncoder> encoder);
+       friend struct ::local_threads_created_and_destroyed;
+       friend struct ::remote_threads_created_and_destroyed;
+       friend struct ::frames_not_lost_when_threads_disappear;
 
        void frame_done ();
-
-       void encoder_thread (boost::optional<EncodeServerDescription>);
+       void servers_list_changed ();
+       void remake_threads(int cpu, int gpu, std::list<EncodeServerDescription> servers);
        void terminate_threads ();
 
        /** Film that we are encoding */
@@ -93,7 +107,7 @@ private:
        EventHistory _history;
 
        boost::mutex _threads_mutex;
-       std::shared_ptr<boost::thread_group> _threads;
+       std::vector<std::shared_ptr<J2KEncoderThread>> _threads;
 
        mutable boost::mutex _queue_mutex;
        std::list<DCPVideo> _queue;
@@ -102,13 +116,20 @@ private:
        /** 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;
+
+#ifdef DCPOMATIC_GROK
+       grk_plugin::DcpomaticContext* _dcpomatic_context;
+       grk_plugin::GrokContext *_context;
+#endif
+
+       bool _ending = false;
 };