Merge branch 'grok2' into v2.17.xv2.17.8

This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/lib/remote_j2k_encoder_thread.h b/src/lib/remote_j2k_encoder_thread.h
new file mode 100644
index 000000000..f3fe7f94a
--- /dev/null
+++ b/src/lib/remote_j2k_encoder_thread.h
@@ -0,0 +1,21 @@
+#include "encode_server_description.h"
+#include "j2k_sync_encoder_thread.h"
+
+
+class RemoteJ2KEncoderThread : public J2KSyncEncoderThread
+{
+public:
+	RemoteJ2KEncoderThread(J2KEncoder& encoder, EncodeServerDescription server);
+
+	void log_thread_start() const override;
+	std::shared_ptr<dcp::ArrayData> encode(DCPVideo const& frame) override;
+
+	EncodeServerDescription server() const {
+		return _server;
+	}
+
+private:
+	EncodeServerDescription _server;
+	/** Number of seconds that we currently wait between attempts to connect to the server */
+	int _remote_backoff = 0;
+};