X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=9223efb3eb6642592e1fa36af82a0a266bca774f;hb=a6c2aa6cad5872d27654553d447cb34185317974;hp=9b725cb86df7f15fdb34d1449dbbe6a803ae056c;hpb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 9b725cb86..9223efb3e 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -27,13 +27,15 @@
 #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/player_video.h"
+#include "lib/encoded_data.h"
 
 using std::cout;
 using std::cerr;
@@ -44,23 +46,18 @@ 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<PlayerImage> image, Eyes eyes, ColourConversion conversion, DCPTime)
+process_video (shared_ptr<PlayerVideo> pvf)
 {
-	shared_ptr<DCPVideoFrame> local  (
-		new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)
-		);
-	
-	shared_ptr<DCPVideoFrame> remote (
-		new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, 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 << ": ";
+	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
 
-	++frame;
+	++frame_count;
 
 	shared_ptr<EncodedData> local_encoded = local->encode_locally ();
 	shared_ptr<EncodedData> remote_encoded;
@@ -107,7 +104,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'},
@@ -148,12 +145,10 @@ main (int argc, char* argv[])
 		film->read_metadata ();
 		
 		shared_ptr<Player> 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 ();
+		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";