X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=0cd728165199e0a9c1a604352681c50617dc99e6;hb=6154d5f85664a26e9490c9120bef5e742af94490;hp=184dde9b8512904e0a49ef3e6e27d89ff9cf7565;hpb=a6c2aa6cad5872d27654553d447cb34185317974;p=dcpomatic.git diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 184dde9b8..0cd728165 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -33,12 +33,13 @@ #include "lib/dcp_video.h" #include "lib/scaler.h" #include "lib/player_video.h" -#include "lib/image_proxy.h" +#include "lib/raw_image_proxy.h" #include "lib/encoded_data.h" using std::list; using boost::shared_ptr; using boost::thread; +using boost::optional; void do_remote_encode (shared_ptr frame, ServerDescription description, shared_ptr locally_encoded) @@ -83,9 +84,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), Scaler::from_id ("bicubic"), @@ -166,9 +168,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr pvf ( new PlayerVideo ( - shared_ptr (new RawImageProxy (image, log)), + shared_ptr (new RawImageProxy (image)), DCPTime (), Crop (), + optional (), dcp::Size (1998, 1080), dcp::Size (1998, 1080), Scaler::from_id ("bicubic"),