Various Doxygen fixes.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 8a3b0fec484134fae2d2ba90d24981b38bae7ad5..fab9411abb2ff528692ce86aca756f85b2543a6f 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,38 +1,40 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @file  test/client_server_test.cc
  *  @brief Test the server class.
+ *  @ingroup specific
  *
  *  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/server_description.h"
+#include "lib/encode_server_description.h"
 #include "lib/file_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
@@ -44,7 +46,7 @@ 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, 60));
@@ -86,7 +88,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
-                       DCPTime (),
                        Crop (),
                        optional<double> (),
                        dcp::Size (1998, 1080),
@@ -112,14 +113,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) {
@@ -166,7 +167,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
-                       DCPTime (),
                        Crop (),
                        optional<double> (),
                        dcp::Size (1998, 1080),
@@ -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) {
@@ -233,7 +233,6 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
        shared_ptr<PlayerVideo> raw_pvf (
                new PlayerVideo (
                        shared_ptr<ImageProxy> (new RawImageProxy (image)),
-                       DCPTime (),
                        Crop (),
                        optional<double> (),
                        dcp::Size (1998, 1080),
@@ -259,8 +258,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
        shared_ptr<PlayerVideo> j2k_pvf (
                new PlayerVideo (
-                       shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))),
-                       DCPTime (),
+                       shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080), AV_PIX_FMT_XYZ12LE)),
                        Crop (),
                        optional<double> (),
                        dcp::Size (1998, 1080),
@@ -284,14 +282,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) {