X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=ba16697564705fe25afe03dc2458522e4de9899a;hb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;hp=029e626147c9b8b68203aa14fde38bcba598a752;hpb=7b721e7bfe0dd35957c8f56b7ec430aa21114971;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 029e62614..ba1669756 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -34,6 +34,7 @@
 #include "lib/log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"
+#include "lib/dcp_video.h"
 
 using std::cout;
 using std::cerr;
@@ -44,18 +45,27 @@ 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<const Image> image, Eyes eyes, ColourConversion conversion, Time)
+process_video (shared_ptr<DCPVideo> frame)
 {
-	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
-	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+	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_
+			)
+		);
 
-	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;
@@ -137,18 +147,16 @@ main (int argc, char* argv[])
 
 	dcpomatic_setup ();
 
-	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 ();
-
 	try {
-		player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
-		bool done = false;
-		while (!done) {
-			done = player->pass ();
+		server = new ServerDescription (server_host, 1);
+		film.reset (new Film (film_dir));
+		film->read_metadata ();
+		
+		shared_ptr<Player> player = film->make_player ();
+
+		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";