X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=6f7a435690a8645b29a02ed7bbcdb9370248f29f;hb=0f7110dc6a34640a55ba5bdc16dd23f2b9f47d30;hp=9223efb3eb6642592e1fa36af82a0a266bca774f;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c;p=dcpomatic.git diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 9223efb3e..6f7a43569 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,17 +25,15 @@ #include "lib/film.h" #include "lib/filter.h" #include "lib/util.h" -#include "lib/scaler.h" #include "lib/server.h" #include "lib/dcp_video.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.h" -#include "lib/encoded_data.h" +#include "lib/data.h" using std::cout; using std::cerr; @@ -59,8 +57,8 @@ process_video (shared_ptr pvf) ++frame_count; - shared_ptr local_encoded = local->encode_locally (); - shared_ptr remote_encoded; + Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2)); + Data remote_encoded; string remote_error; try { @@ -74,14 +72,14 @@ process_video (shared_ptr pvf) 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) { + uint8_t* p = local_encoded.data().get (); + uint8_t* q = remote_encoded.data().get (); + for (int i = 0; i < local_encoded.size(); ++i) { if (*p++ != *q++) { cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n"; return; @@ -144,7 +142,7 @@ main (int argc, char* argv[]) film.reset (new Film (film_dir)); film->read_metadata (); - shared_ptr player = film->make_player (); + shared_ptr player (new Player (film)); DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ()); for (DCPTime t; t < film->length(); t += frame) {