summaryrefslogtreecommitdiff
path: root/src/lib/encode_server.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-10-18 13:47:29 +0200
committerCarl Hetherington <cth@carlh.net>2023-10-18 13:47:29 +0200
commit1baae6f052775956bab33a8d9ae9f94066227225 (patch)
tree9c634a1b2914d4bf889e171b73c770469415f799 /src/lib/encode_server.h
parent6eba9bffa2371aa71b8981b1a7bcde0448d7623e (diff)
parentb0c1482f98c7e00634c1bc3dd801e76ce69907e2 (diff)
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.
Diffstat (limited to 'src/lib/encode_server.h')
-rw-r--r--src/lib/encode_server.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index f93d66746..8059abd0f 100644
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -32,6 +32,7 @@
#include "exception_store.h"
#include "server.h"
#include <boost/asio.hpp>
+#include <boost/atomic.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <string>
@@ -53,6 +54,10 @@ public:
void run () override;
+ int frames_encoded() const {
+ return _frames_encoded;
+ }
+
private:
void handle (std::shared_ptr<Socket>) override;
void worker_thread ();
@@ -67,6 +72,7 @@ private:
bool _verbose;
int _num_threads;
Waker _waker;
+ boost::atomic<int> _frames_encoded;
struct Broadcast {