Rename CPU J2K -> OpenJPEG J2K so we can differentiate from Kakadu.

5 files changed, 23 insertions, 23 deletions

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index bc4030531..e3e3c881b 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -31,11 +31,11 @@
 #include "encode_server_description.h"
 #include "encode_server_finder.h"
 #include "film.h"
-#include "cpu_j2k_encoder_thread.h"
 #ifdef DCPOMATIC_GROK
 #include "grok/context.h"
 #include "grok_j2k_encoder_thread.h"
 #endif
+#include "openjpeg_j2k_encoder_thread.h"
 #include "remote_j2k_encoder_thread.h"
 #include "j2k_encoder.h"
 #include "log.h"
@@ -140,11 +140,11 @@ J2KEncoder::servers_list_changed()
 	auto const grok_enable = false;
 #endif
 
-	auto const cpu = (grok_enable || config->only_servers_encode()) ? 0 : config->master_encoding_threads();
+	auto const openjpeg = (grok_enable || config->only_servers_encode()) ? 0 : config->master_encoding_threads();
 	auto const gpu = grok_enable ? config->master_encoding_threads() : 0;
 
 	LOG_GENERAL("Thread counts from: grok={}, only_servers={}, master={}", grok_enable ? "yes" : "no", config->only_servers_encode() ? "yes" : "no", config->master_encoding_threads());
-	remake_threads(cpu, gpu, EncodeServerFinder::instance()->servers());
+	remake_threads(openjpeg, gpu, EncodeServerFinder::instance()->servers());
 }
 
 
@@ -362,14 +362,14 @@ J2KEncoder::terminate_threads()
 
 
 void
-J2KEncoder::remake_threads(int cpu, int gpu, list<EncodeServerDescription> servers)
+J2KEncoder::remake_threads(int openjpeg, int gpu, list<EncodeServerDescription> servers)
 {
-	LOG_GENERAL("Making threads: CPU={}, GPU={}, Remote={}", cpu, gpu, servers.size());
-	if ((cpu + gpu + servers.size()) == 0) {
+	LOG_GENERAL("Making threads: OpenJPEG={}, GPU={}, Remote={}", openjpeg, gpu, servers.size());
+	if ((openjpeg + gpu + servers.size()) == 0) {
 		/* Make at least one thread, even if all else fails.  Maybe we are configured
 		 * for "only servers encode" but no servers have been registered yet.
 		 */
-		++cpu;
+		++openjpeg;
 	}
 
 	boost::mutex::scoped_lock lm(_threads_mutex);
@@ -388,21 +388,21 @@ J2KEncoder::remake_threads(int cpu, int gpu, list<EncodeServerDescription> serve
 	};
 
 
-	/* CPU */
+	/* OpenJPEG (on CPU) */
 
-	auto const is_cpu_thread = [](shared_ptr<J2KEncoderThread> thread) {
-		return static_cast<bool>(dynamic_pointer_cast<CPUJ2KEncoderThread>(thread));
+	auto const is_openjpeg_thread = [](shared_ptr<J2KEncoderThread> thread) {
+		return static_cast<bool>(dynamic_pointer_cast<OpenJPEGJ2KEncoderThread>(thread));
 	};
 
-	auto const current_cpu_threads = std::count_if(_threads.begin(), _threads.end(), is_cpu_thread);
+	auto const current_openjpeg_threads = std::count_if(_threads.begin(), _threads.end(), is_openjpeg_thread);
 
-	for (auto i = current_cpu_threads; i < cpu; ++i) {
-		auto thread = make_shared<CPUJ2KEncoderThread>(*this);
+	for (auto i = current_openjpeg_threads; i < openjpeg; ++i) {
+		auto thread = make_shared<OpenJPEGJ2KEncoderThread>(*this);
 		thread->start();
 		_threads.push_back(thread);
 	}
 
-	remove_threads(cpu, current_cpu_threads, is_cpu_thread);
+	remove_threads(openjpeg, current_openjpeg_threads, is_openjpeg_thread);
 
 #ifdef DCPOMATIC_GROK
 	/* GPU */
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 3bdcaecd9..18f7be9e4 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -101,7 +101,7 @@ private:
 
 	void frame_done();
 	void servers_list_changed();
-	void remake_threads(int cpu, int gpu, std::list<EncodeServerDescription> servers);
+	void remake_threads(int openjpeg, int gpu, std::list<EncodeServerDescription> servers);
 	void terminate_threads();
 
 	boost::mutex _threads_mutex;
diff --git a/src/lib/cpu_j2k_encoder_thread.cc b/src/lib/openjpeg_j2k_encoder_thread.cc
index 6ff38e5da..e803b78d0 100644
--- a/src/lib/cpu_j2k_encoder_thread.cc
+++ b/src/lib/openjpeg_j2k_encoder_thread.cc
@@ -19,11 +19,11 @@
 */
 
 
-#include "cpu_j2k_encoder_thread.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
 #include "dcp_video.h"
 #include "j2k_encoder.h"
+#include "openjpeg_j2k_encoder_thread.h"
 #include "util.h"
 
 #include "i18n.h"
@@ -33,7 +33,7 @@ using std::make_shared;
 using std::shared_ptr;
 
 
-CPUJ2KEncoderThread::CPUJ2KEncoderThread(J2KEncoder& encoder)
+OpenJPEGJ2KEncoderThread::OpenJPEGJ2KEncoderThread(J2KEncoder& encoder)
 	: J2KSyncEncoderThread(encoder)
 {
 
@@ -41,15 +41,15 @@ CPUJ2KEncoderThread::CPUJ2KEncoderThread(J2KEncoder& encoder)
 
 
 void
-CPUJ2KEncoderThread::log_thread_start() const
+OpenJPEGJ2KEncoderThread::log_thread_start() const
 {
-	start_of_thread("CPUJ2KEncoder");
+	start_of_thread("OpenJPEGJ2KEncoder");
 	LOG_TIMING("start-encoder-thread thread={} server=localhost", thread_id());
 }
 
 
 shared_ptr<dcp::ArrayData>
-CPUJ2KEncoderThread::encode(DCPVideo const& frame)
+OpenJPEGJ2KEncoderThread::encode(DCPVideo const& frame)
 {
 	try {
 		return make_shared<dcp::ArrayData>(frame.encode_locally());
diff --git a/src/lib/cpu_j2k_encoder_thread.h b/src/lib/openjpeg_j2k_encoder_thread.h
index 11a2cfed1..130245929 100644
--- a/src/lib/cpu_j2k_encoder_thread.h
+++ b/src/lib/openjpeg_j2k_encoder_thread.h
@@ -26,10 +26,10 @@
 class DCPVideo;
 
 
-class CPUJ2KEncoderThread : public J2KSyncEncoderThread
+class OpenJPEGJ2KEncoderThread : public J2KSyncEncoderThread
 {
 public:
-	CPUJ2KEncoderThread(J2KEncoder& encoder);
+	OpenJPEGJ2KEncoderThread(J2KEncoder& encoder);
 
 	void log_thread_start() const override;
 	std::shared_ptr<dcp::ArrayData> encode(DCPVideo const& frame) override;
diff --git a/src/lib/wscript b/src/lib/wscript
index ed55ec4d0..79393c425 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -60,7 +60,6 @@ sources = """
           combine_dcp_job.cc
           copy_dcp_details_to_film.cc
           cover_sheet.cc
-          cpu_j2k_encoder_thread.cc
           create_cli.cc
           crop.cc
           cross_common.cc
@@ -169,6 +168,7 @@ sources = """
           mid_side_decoder.cc
           mpeg2_encoder.cc
           named_channel.cc
+          openjpeg_j2k_encoder_thread.cc
           overlaps.cc
           pixel_quanta.cc
           player.cc