X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=9e9a01694f43bc76e82e74546019c67e28c41896;hb=f29f405000752ad568de1e304640a4edac8214bc;hp=6a1e2fa4140d8f2c5bb49693a1c1779312ace9cd;hpb=5c09a82e483593fb37da0cad20679be735887613;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 6a1e2fa41..9e9a01694 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
@@ -17,24 +17,24 @@
 
 */
 
-#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/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/file_log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"
-#include "lib/player_video_frame.h"
+#include "lib/player_video.h"
+#include "lib/data.h"
+#include "lib/server_description.h"
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
+#include <exception>
 
 using std::cout;
 using std::cerr;
@@ -45,21 +45,21 @@ using boost::shared_ptr;
 static shared_ptr<Film> film;
 static ServerDescription* server;
 static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
-static int frame = 0;
+static int frame_count = 0;
 
 void
-process_video (shared_ptr<PlayerVideoFrame> pvf)
+process_video (shared_ptr<PlayerVideo> pvf)
 {
-	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (pvf->image(), frame, pvf->eyes(), pvf->colour_conversion(), film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
-	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf->image(), frame, pvf->eyes(), pvf->colour_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, log_));
+	shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 
-	cout << "Frame " << frame << ": ";
+	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
 
-	++frame;
+	++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 {
@@ -73,14 +73,14 @@ process_video (shared_ptr<PlayerVideoFrame> 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;
@@ -103,7 +103,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'},
@@ -130,7 +130,7 @@ main (int argc, char* argv[])
 			break;
 		}
 	}
-	
+
 	if (server_host.empty() || film_dir.empty()) {
 		help (argv[0]);
 		exit (EXIT_FAILURE);
@@ -142,14 +142,12 @@ 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 ();
-		player->disable_audio ();
-
-		player->Video.connect (boost::bind (process_video, _1));
-		bool done = false;
-		while (!done) {
-			done = player->pass ();
+
+		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) {
+			process_video (player->get_video(t, true).front ());
 		}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";