X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=6c7371253fc3df789342bd5e1961dd57049457a9;hb=6939ebc3c1b4789d577101625a3af92ada4fa92f;hp=48d817cfe981eeb44c9e998ab5ed4a7747a68d6e;hpb=8f7d0cf115980cb357bc3da410842503930e66b8;p=dcpomatic.git diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 48d817cfe..6c7371253 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -1,65 +1,75 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include -#include "lib/ratio.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/film.h" #include "lib/filter.h" +#include "lib/player.h" +#include "lib/player_video.h" +#include "lib/ratio.h" #include "lib/util.h" -#include "lib/scaler.h" -#include "lib/server.h" -#include "lib/dcp_video_frame.h" -#include "lib/decoder.h" -#include "lib/exceptions.h" -#include "lib/scaler.h" -#include "lib/log.h" #include "lib/video_decoder.h" -#include "lib/player.h" -#include "lib/player_video_frame.h" +#include +#include +#include +#include + -using std::cout; using std::cerr; -using std::string; +using std::cout; +using std::make_shared; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using boost::optional; +using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using dcp::ArrayData; + static shared_ptr film; -static ServerDescription* server; -static shared_ptr log_ (new FileLog ("servomatictest.log")); -static int frame = 0; +static EncodeServerDescription* server; +static int frame_count = 0; + void -process_video (shared_ptr image, Eyes eyes, ColourConversion conversion, Time) +process_video (shared_ptr pvf) { - shared_ptr local (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); - shared_ptr remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + auto local = make_shared(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K); + auto remote = make_shared(pvf, frame_count, film->video_frame_rate(), 250000000, Resolution::TWO_K); - cout << "Frame " << frame << ": "; + cout << "Frame " << frame_count << ": "; cout.flush (); - ++frame; + ++frame_count; - shared_ptr local_encoded = local->encode_locally (); - shared_ptr remote_encoded; + auto local_encoded = local->encode_locally (); + ArrayData remote_encoded; string remote_error; try { @@ -68,19 +78,19 @@ process_video (shared_ptr image, Eyes eyes, ColourConversion c remote_error = e.what (); } - if (!remote_error.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.size() != remote_encoded.size()) { cout << "\033[0;31msizes differ\033[0m\n"; return; } - - uint8_t* p = local_encoded->data(); - uint8_t* q = remote_encoded->data(); - for (int i = 0; i < local_encoded->size(); ++i) { + + auto p = local_encoded.data(); + auto q = remote_encoded.data(); + for (int i = 0; i < local_encoded.size(); ++i) { if (*p++ != *q++) { cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n"; return; @@ -90,6 +100,7 @@ process_video (shared_ptr image, Eyes eyes, ColourConversion c cout << "\033[0;32mgood\033[0m\n"; } + static void help (string n) { @@ -97,13 +108,14 @@ help (string n) exit (EXIT_FAILURE); } + int main (int argc, char* argv[]) { - string film_dir; + boost::filesystem::path film_dir; string server_host; - while (1) { + while (true) { static struct option long_options[] = { { "help", no_argument, 0, 'h'}, { "server", required_argument, 0, 's'}, @@ -130,8 +142,8 @@ main (int argc, char* argv[]) break; } } - - if (server_host.empty() || film_dir.empty()) { + + if (server_host.empty() || film_dir.string().empty()) { help (argv[0]); exit (EXIT_FAILURE); } @@ -139,18 +151,13 @@ main (int argc, char* argv[]) dcpomatic_setup (); try { - server = new ServerDescription (server_host, 1); - film.reset (new Film (film_dir)); + server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION); + film = make_shared(film_dir); film->read_metadata (); - - shared_ptr player = film->make_player (); - player->disable_audio (); - - player->Video.connect (boost::bind (process_video, _1, _2, _3, _5)); - bool done = false; - while (!done) { - done = player->pass (); - } + + auto player = make_shared(film); + player->Video.connect (bind(&process_video, _1)); + while (!player->pass ()) {} } catch (std::exception& e) { cerr << "Error: " << e.what() << "\n"; }