diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-09-26 13:32:00 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-28 02:01:57 +0100 |
| commit | ce1c39e267c2bca215861d1ccc3e68ab1359ce30 (patch) | |
| tree | 9937e907ca0cc1ce1036ce0d103d01e0aa19d126 /src | |
| parent | e55d917a7e3a0d2988c3f53c3027fe890970e6a8 (diff) | |
Forward-declare grk_plugin stuff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/grok_j2k_encoder_thread.cc | 8 | ||||
| -rw-r--r-- | src/lib/j2k_encoder.cc | 1 | ||||
| -rw-r--r-- | src/lib/j2k_encoder.h | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/grok_j2k_encoder_thread.cc b/src/lib/grok_j2k_encoder_thread.cc index 54e5fe252..9ed0913be 100644 --- a/src/lib/grok_j2k_encoder_thread.cc +++ b/src/lib/grok_j2k_encoder_thread.cc @@ -23,6 +23,7 @@ #include "cross.h" #include "dcpomatic_log.h" #include "dcp_video.h" +#include "grok/context.h" #include "grok_j2k_encoder_thread.h" #include "j2k_encoder.h" #include "util.h" @@ -52,15 +53,8 @@ try LOG_TIMING("encoder-sleep thread=%1", thread_id()); auto frame = _encoder.pop(); -<<<<<<< HEAD - ScopeGuard frame_guard([this, &frame]() { -||||||| parent of 04d2316ac (fixup! Rearrange encoder threading.) - ScopeGuard frame_guard([this, &frame]() { - LOG_ERROR("Failed to schedule encode of %1 using grok", frame.index()); -======= dcp::ScopeGuard frame_guard([this, &frame]() { LOG_ERROR("Failed to schedule encode of %1 using grok", frame.index()); ->>>>>>> 04d2316ac (fixup! Rearrange encoder threading.) _encoder.retry(frame); }); diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index 1a96eb942..0ed7d20ac 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -34,6 +34,7 @@ #include "film.h" #include "cpu_j2k_encoder_thread.h" #ifdef DCPOMATIC_GROK +#include "grok/context.h" #include "grok_j2k_encoder_thread.h" #endif #include "remote_j2k_encoder_thread.h" diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h index 913beb5a9..0dbe654a4 100644 --- a/src/lib/j2k_encoder.h +++ b/src/lib/j2k_encoder.h @@ -32,9 +32,6 @@ #include "enum_indexed_vector.h" #include "event_history.h" #include "exception_store.h" -#ifdef DCPOMATIC_GROK -#include "grok/context.h" -#endif #include "j2k_encoder_thread.h" #include "writer.h" #include <boost/optional.hpp> @@ -52,6 +49,11 @@ class Film; class Job; class PlayerVideo; +namespace grk_plugin { + struct DcpomaticContext; + struct GrokContext; +} + struct local_threads_created_and_destroyed; struct remote_threads_created_and_destroyed; struct frames_not_lost_when_threads_disappear; |