X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=02f4e667398fb16376ee17411bbc5b5b79a8f02b;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=ba16697564705fe25afe03dc2458522e4de9899a;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index ba1669756..02f4e6673 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -25,16 +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_frame.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/dcp_video.h"
+#include "lib/player_video.h"
+#include "lib/data.h"
 
 using std::cout;
 using std::cerr;
@@ -48,27 +47,18 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
 void
-process_video (shared_ptr<DCPVideo> frame)
+process_video (shared_ptr<PlayerVideo> pvf)
 {
-	shared_ptr<DCPVideoFrame> local  (
-		new DCPVideoFrame (
-			frame->image (PIX_FMT_RGB24, false), frame_count, frame->eyes(), frame->conversion(), film->video_frame_rate(), 250000000, RESOLUTION_2K, log_
-			)
-		);
-	
-	shared_ptr<DCPVideoFrame> remote (
-		new DCPVideoFrame (
-			frame->image (PIX_FMT_RGB24, false), frame_count, frame->eyes(), frame->conversion(), film->video_frame_rate(), 250000000, RESOLUTION_2K, log_
-			)
-		);
+	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_));
 
 	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 {
@@ -82,14 +72,14 @@ process_video (shared_ptr<DCPVideo> frame)
 		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;
@@ -112,7 +102,7 @@ main (int argc, char* argv[])
 	string film_dir;
 	string server_host;
 
-	while (1) {
+	while (true) {
 		static struct option long_options[] = {
 			{ "help", no_argument, 0, 'h'},
 			{ "server", required_argument, 0, 's'},
@@ -139,7 +129,7 @@ main (int argc, char* argv[])
 			break;
 		}
 	}
-	
+
 	if (server_host.empty() || film_dir.empty()) {
 		help (argv[0]);
 		exit (EXIT_FAILURE);
@@ -151,8 +141,8 @@ main (int argc, char* argv[])
 		server = new ServerDescription (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));
 
 		DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
 		for (DCPTime t; t < film->length(); t += frame) {