X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=5e50df227ed703f87d229005e861d418df00c630;hp=9223efb3eb6642592e1fa36af82a0a266bca774f;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 9223efb3e..5e50df227 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,66 +1,66 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
-#include <iostream>
-#include <iomanip>
-#include <exception>
-#include <getopt.h>
 #include "lib/ratio.h"
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
-#include "lib/server.h"
+#include "lib/encode_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/file_log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
-#include "lib/encoded_data.h"
+#include "lib/encode_server_description.h"
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
+#include <exception>
 
 using std::cout;
 using std::cerr;
 using std::string;
 using std::pair;
 using boost::shared_ptr;
+using dcp::Data;
 
 static shared_ptr<Film> film;
-static ServerDescription* server;
+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, true, log_));
-	shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_));
+	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_));
 
 	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
 
 	++frame_count;
 
-	shared_ptr<EncodedData> local_encoded = local->encode_locally ();
-	shared_ptr<EncodedData> 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 +74,14 @@ process_video (shared_ptr<PlayerVideo> 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;
@@ -131,7 +131,7 @@ main (int argc, char* argv[])
 			break;
 		}
 	}
-	
+
 	if (server_host.empty() || film_dir.empty()) {
 		help (argv[0]);
 		exit (EXIT_FAILURE);
@@ -140,11 +140,11 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	try {
-		server = new ServerDescription (server_host, 1);
+		server = new EncodeServerDescription (server_host, 1);
 		film.reset (new Film (film_dir));
 		film->read_metadata ();
-		
-		shared_ptr<Player> player = film->make_player ();
+
+		shared_ptr<Player> player (new Player (film, film->playlist ()));
 
 		DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
 		for (DCPTime t; t < film->length(); t += frame) {