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, 28 insertions, 11 deletions

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 9a840c8ab..bd78312fa 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 /** @file  src/dcp_encoder.cc
  *  @brief A class which takes a Film and some Options, then uses those to encode the film into a DCP.
  *
@@ -25,31 +26,33 @@
  *  as a parameter to the constructor.
  */
 
+
+#include "audio_decoder.h"
+#include "compose.hpp"
 #include "dcp_encoder.h"
-#include "j2k_encoder.h"
 #include "film.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "player.h"
+#include "j2k_encoder.h"
 #include "job.h"
-#include "writer.h"
-#include "compose.hpp"
+#include "player.h"
+#include "player_video.h"
 #include "referenced_reel_asset.h"
 #include "text_content.h"
-#include "player_video.h"
+#include "video_decoder.h"
+#include "writer.h"
 #include <boost/signals2.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::vector;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using std::weak_ptr;
-using std::dynamic_pointer_cast;
-using std::make_shared;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -118,6 +121,20 @@ DCPEncoder::go ()
 	_writer.finish(_film->dir(_film->dcp_name()));
 }
 
+
+void
+DCPEncoder::pause()
+{
+	_j2k_encoder.pause();
+}
+
+
+void
+DCPEncoder::resume()
+{
+	_j2k_encoder.resume();
+}
+
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {