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

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index b05b20a16..35870231d 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -37,6 +37,8 @@
 
 class Encoder;
 
+struct frames_not_lost_when_threads_disappear;
+
 
 /** @class TranscodeJob
  *  @brief A job which transcodes a Film to another format.
@@ -56,6 +58,8 @@ public:
 	std::string name () const override;
 	std::string json_name () const override;
 	void run () override;
+	void pause() override;
+	void resume() override;
 	std::string status () const override;
 	bool enable_notify () const override {
 		return true;
@@ -64,6 +68,8 @@ public:
 	void set_encoder (std::shared_ptr<Encoder> t);
 
 private:
+	friend struct ::frames_not_lost_when_threads_disappear;
+
 	virtual void post_transcode () {}
 	float frames_per_second() const;