Allow J2K encode backends to accept more than one frame at once.

[dcpomatic.git] / src / tools / server_test.cc

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 3fa7ebb6042ed999c1ca96a50a520b3dee82f043..baae6ac40257cf1a0d4bdd00603817c318909e4c 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,72 +18,87 @@
 
 */
 
-#include "lib/ratio.h"
-#include "lib/film.h"
-#include "lib/filter.h"
-#include "lib/util.h"
-#include "lib/encode_server.h"
+
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
+#include "lib/encode_server.h"
+#include "lib/encode_server_description.h"
 #include "lib/exceptions.h"
 #include "lib/file_log.h"
-#include "lib/video_decoder.h"
+#include "lib/film.h"
+#include "lib/filter.h"
 #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 "lib/ratio.h"
+#include "lib/util.h"
+#include "lib/video_decoder.h"
 #include <getopt.h>
-#include <iostream>
-#include <iomanip>
 #include <exception>
+#include <iomanip>
+#include <iostream>
+
 
-using std::cout;
 using std::cerr;
+using std::cout;
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
-using std::pair;
-using boost::shared_ptr;
+using std::vector;
 using boost::optional;
 using boost::bind;
-using dcp::Data;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
+using namespace dcpomatic;
+
 
 static shared_ptr<Film> film;
 static EncodeServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
+
 void
 process_video (shared_ptr<PlayerVideo> pvf)
 {
-       shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
-       shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+       DCPVideo local(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K);
+       DCPVideo remote(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K);
 
        cout << "Frame " << frame_count << ": ";
        cout.flush ();
 
        ++frame_count;
 
-       Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
-       Data remote_encoded;
+       J2KEncoderCPUBackend cpu_backend;
+       auto local_encoded = cpu_backend.encode({local});
+       vector<ArrayData> remote_encoded;
 
        string remote_error;
+       J2KEncoderRemoteBackend remote_backend(*server);
        try {
-               remote_encoded = remote->encode_remotely (*server);
+               remote_encoded = remote_backend.encode({remote});
        } catch (NetworkError& e) {
                remote_error = e.what ();
        }
 
-       if (!remote_error.empty ()) {
+       DCPOMATIC_ASSERT (!local_encoded.empty());
+       DCPOMATIC_ASSERT (!remote_encoded.empty());
+
+       if (!remote_error.empty()) {
                cout << "\033[0;31mnetwork problem: " << remote_error << "\033[0m\n";
                return;
        }
 
-       if (local_encoded.size() != remote_encoded.size()) {
+       if (local_encoded[0].size() != remote_encoded[0].size()) {
                cout << "\033[0;31msizes differ\033[0m\n";
                return;
        }
 
-       uint8_t* p = local_encoded.data().get ();
-       uint8_t* q = remote_encoded.data().get ();
-       for (int i = 0; i < local_encoded.size(); ++i) {
+       auto p = local_encoded[0].data();
+       auto q = remote_encoded[0].data();
+       for (int i = 0; i < local_encoded[0].size(); ++i) {
                if (*p++ != *q++) {
                        cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
                        return;
@@ -93,6 +108,7 @@ process_video (shared_ptr<PlayerVideo> pvf)
        cout << "\033[0;32mgood\033[0m\n";
 }
 
+
 static void
 help (string n)
 {
@@ -100,6 +116,7 @@ help (string n)
        exit (EXIT_FAILURE);
 }
 
+
 int
 main (int argc, char* argv[])
 {
@@ -142,12 +159,12 @@ main (int argc, char* argv[])
        dcpomatic_setup ();
 
        try {
-               server = new EncodeServerDescription (server_host, 1);
-               film.reset (new Film (film_dir));
+               server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION);
+               film = make_shared<Film>(film_dir);
                film->read_metadata ();
 
-               shared_ptr<Player> player (new Player (film, film->playlist ()));
-               player->Video.connect (bind (&process_video, _1));
+               auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+               player->Video.connect (bind(&process_video, _1));
                while (!player->pass ()) {}
        } catch (std::exception& e) {
                cerr << "Error: " << e.what() << "\n";