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

diff --git a/src/lib/j2k_encoder_thread.cc b/src/lib/j2k_encoder_thread.cc
new file mode 100644
index 000000000..0199209be
--- /dev/null
+++ b/src/lib/j2k_encoder_thread.cc
@@ -0,0 +1,38 @@
+#include "dcp_video.h"
+#include "dcpomatic_log.h"
+#include "j2k_encoder.h"
+#include "j2k_encoder_thread.h"
+#include "scope_guard.h"
+
+
+J2KEncoderThread::J2KEncoderThread(J2KEncoder& encoder)
+	: _encoder(encoder)
+{
+
+}
+
+
+void
+J2KEncoderThread::start()
+{
+	_thread = boost::thread(boost::bind(&J2KEncoderThread::run, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np(_thread.native_handle(), "encode-worker");
+#endif
+}
+
+
+void
+J2KEncoderThread::stop()
+{
+	_thread.interrupt();
+	try {
+		_thread.join();
+	} catch (std::exception& e) {
+		LOG_ERROR("join() threw an exception: %1", e.what());
+	} catch (...) {
+		LOG_ERROR_NC("join() threw an exception");
+	}
+}
+
+