Merge master.

[dcpomatic.git] / src / tools / server_test.cc

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index f0a44954ff2ee2ed88d9dcaef2de1044a7f42f09..9b725cb86df7f15fdb34d1449dbbe6a803ae056c 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -47,10 +47,15 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame = 0;
 
 void
-process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time)
+process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, DCPTime)
 {
-       shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
-       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+       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_)
+               );
 
        cout << "Frame " << frame << ": ";
        cout.flush ();
@@ -137,14 +142,14 @@ 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 {
+               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, _2, _3, _5));
                bool done = false;
                while (!done) {