summaryrefslogtreecommitdiff
path: root/src/tools/server_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-08-13 14:55:20 +0200
committerCarl Hetherington <cth@carlh.net>2020-09-13 20:23:29 +0200
commit50e85cf64504b7fc38b4129aa750c2def28b95fd (patch)
tree12d30de6149bc7fa39ab388397da128a7d426a44 /src/tools/server_test.cc
parentdbb5577ff761cfd25f154fc54c2dc7e111a31c77 (diff)
Rearrange encoding so that the different methods / backends are not all crammed into DCPVideo.
Diffstat (limited to 'src/tools/server_test.cc')
-rw-r--r--src/tools/server_test.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 99a6b4caf..4f8d0b4d1 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -31,6 +31,8 @@
#include "lib/player.h"
#include "lib/player_video.h"
#include "lib/encode_server_description.h"
+#include "lib/j2k_encoder_cpu_backend.h"
+#include "lib/j2k_encoder_remote_backend.h"
#include <getopt.h>
#include <iostream>
#include <iomanip>
@@ -63,12 +65,14 @@ process_video (shared_ptr<PlayerVideo> pvf)
++frame_count;
- Data local_encoded = local->encode_locally ();
+ J2KEncoderCPUBackend cpu_backend;
+ Data local_encoded = *cpu_backend.encode (local);
Data remote_encoded;
string remote_error;
try {
- remote_encoded = remote->encode_remotely (*server);
+ J2KEncoderRemoteBackend remote_backend(*server);
+ remote_encoded = *remote_backend.encode (remote);
} catch (NetworkError& e) {
remote_error = e.what ();
}