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, 32 insertions, 0 deletions

diff --git a/src/lib/j2k_sync_encoder_thread.h b/src/lib/j2k_sync_encoder_thread.h
new file mode 100644
index 000000000..45222279e
--- /dev/null
+++ b/src/lib/j2k_sync_encoder_thread.h
@@ -0,0 +1,32 @@
+#ifndef DCPOMATIC_J2K_SYNC_ENCODER_THREAD_H
+#define DCPOMATIC_J2K_SYNC_ENCODER_THREAD_H
+
+
+#include "exception_store.h"
+#include "j2k_encoder_thread.h"
+#include <dcp/array_data.h>
+#include <boost/thread.hpp>
+
+
+class DCPVideo;
+class J2KEncoder;
+
+
+class J2KSyncEncoderThread : public J2KEncoderThread, public ExceptionStore
+{
+public:
+	J2KSyncEncoderThread(J2KEncoder& encoder);
+
+	J2KSyncEncoderThread(J2KSyncEncoderThread const&) = delete;
+	J2KSyncEncoderThread& operator=(J2KSyncEncoderThread const&) = delete;
+
+	virtual ~J2KSyncEncoderThread() {}
+
+	void run() override;
+
+	virtual void log_thread_start() const = 0;
+	virtual std::shared_ptr<dcp::ArrayData> encode(DCPVideo const& frame) = 0;
+};
+
+
+#endif