Plot video and subtitle on one track and audio on the rest in the timeline.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index dcd62ba968c215f38a39683694d5a4d7cdbf0eed..e7502af0eadd12c053b634ff5a2d69e2b76352c2 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -21,19 +21,18 @@
  *  @brief Test the server class.
  *
  *  Create a test image and then encode it using the standard mechanism
- *  and also using a Server object running on localhost.  Compare the resulting
+ *  and also using a EncodeServer object running on localhost.  Compare the resulting
  *  encoded data to check that they are the same.
  */
 
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video.h"
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
 #include "lib/j2k_image_proxy.h"
-#include "lib/data.h"
-#include "lib/server_description.h"
+#include "lib/encode_server_description.h"
 #include "lib/file_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
@@ -42,12 +41,13 @@ using std::list;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
+using dcp::Data;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
 {
        Data remotely_encoded;
-       BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
+       BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
 
        BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
        BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
@@ -55,7 +55,7 @@ do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Dat
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
+       shared_ptr<Image> image (new Image (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
        uint8_t* p = image->data()[0];
 
        for (int y = 0; y < 1080; ++y) {
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                p += image->stride()[0];
        }
 
-       shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
        p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -112,14 +112,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
        Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-       Server* server = new Server (log, true);
+       EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&Server::run, server, 2));
+       new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       ServerDescription description ("localhost", 2);
+       EncodeServerDescription description ("localhost", 2);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+       shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 
        for (int i = 0; i < image->planes(); ++i) {
                uint8_t* p = image->data()[i];
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                }
        }
 
-       shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true));
        uint8_t* p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -192,14 +192,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
        Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-       Server* server = new Server (log, true);
+       EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&Server::run, server, 2));
+       new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       ServerDescription description ("localhost", 2);
+       EncodeServerDescription description ("localhost", 2);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
+       shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 
        for (int i = 0; i < image->planes(); ++i) {
                uint8_t* p = image->data()[i];
@@ -284,14 +284,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
        Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-       Server* server = new Server (log, true);
+       EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&Server::run, server, 2));
+       new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       ServerDescription description ("localhost", 2);
+       EncodeServerDescription description ("localhost", 2);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {