Add ImageProxy class.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 8662f54e8f6a3fa11f482da25b423c32e0e125cb..c8a2b49efdcd88f83133ec6e25d81cc3175a5225 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -23,6 +23,9 @@
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video_frame.h"
+#include "lib/scaler.h"
+#include "lib/player_video_frame.h"
+#include "lib/image_proxy.h"
 
 using std::list;
 using boost::shared_ptr;
@@ -67,18 +70,30 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                p += sub_image->stride()[0];
        }
 
-//     shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
+       shared_ptr<PlayerVideoFrame> pvf (
+               new PlayerVideoFrame (
+                       shared_ptr<ImageProxy> (new RawImageProxy (image)),
+                       Crop (),
+                       libdcp::Size (1998, 1080),
+                       libdcp::Size (1998, 1080),
+                       Scaler::from_id ("bicubic"),
+                       EYES_BOTH,
+                       PART_WHOLE,
+                       ColourConversion ()
+                       )
+               );
+
+       pvf->set_subtitle (sub_image, Position<int> (50, 60));
 
        shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
        shared_ptr<DCPVideoFrame> frame (
                new DCPVideoFrame (
-                       image,
+                       pvf,
                        0,
-                       EYES_BOTH,
-                       ColourConversion (),
                        24,
                        200000000,
+                       RESOLUTION_2K,
                        log
                        )
                );
@@ -86,7 +101,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
        shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
        BOOST_ASSERT (locally_encoded);
        
-       Server* server = new Server (log);
+       Server* server = new Server (log, true);
 
        new thread (boost::bind (&Server::run, server, 2));