More of previous.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 1816de8e693df8a1a4fac0bf29e324a12efede53..0cd728165199e0a9c1a604352681c50617dc99e6 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -30,17 +30,19 @@
 #include "lib/server.h"
 #include "lib/image.h"
 #include "lib/cross.h"
-#include "lib/dcp_video_frame.h"
+#include "lib/dcp_video.h"
 #include "lib/scaler.h"
-#include "lib/player_video_frame.h"
-#include "lib/image_proxy.h"
+#include "lib/player_video.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<DCPVideoFrame> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
 {
        shared_ptr<EncodedData> remotely_encoded;
        BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@ -80,10 +82,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
        shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
 
-       shared_ptr<PlayerVideoFrame> pvf (
-               new PlayerVideoFrame (
-                       shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+       shared_ptr<PlayerVideo> pvf (
+               new PlayerVideo (
+                       shared_ptr<ImageProxy> (new RawImageProxy (image)),
+                       DCPTime (),
                        Crop (),
+                       optional<float> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        Scaler::from_id ("bicubic"),
@@ -95,13 +99,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
        pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
-       shared_ptr<DCPVideoFrame> frame (
-               new DCPVideoFrame (
+       shared_ptr<DCPVideo> frame (
+               new DCPVideo (
                        pvf,
                        0,
                        24,
                        200000000,
                        RESOLUTION_2K,
+                       true,
                        log
                        )
                );
@@ -130,6 +135,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
        for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
                delete *i;
        }
+
+       delete server;
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_yuv)
@@ -159,10 +166,12 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
        shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
 
-       shared_ptr<PlayerVideoFrame> pvf (
-               new PlayerVideoFrame (
-                       shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+       shared_ptr<PlayerVideo> pvf (
+               new PlayerVideo (
+                       shared_ptr<ImageProxy> (new RawImageProxy (image)),
+                       DCPTime (),
                        Crop (),
+                       optional<float> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        Scaler::from_id ("bicubic"),
@@ -174,13 +183,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
        pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
 
-       shared_ptr<DCPVideoFrame> frame (
-               new DCPVideoFrame (
+       shared_ptr<DCPVideo> frame (
+               new DCPVideo (
                        pvf,
                        0,
                        24,
                        200000000,
                        RESOLUTION_2K,
+                       true,
                        log
                        )
                );
@@ -209,5 +219,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
        for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
                delete *i;
        }
+
+       delete server;
 }