Try using ffcmp instead of md5 checking for FFmpeg file tests.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e7502af0eadd12c053b634ff5a2d69e2b76352c2..cb1aba3895680144ff2bccb3ae87562b003dc4b0 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,24 +1,26 @@
 /*
     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 EncodeServer object running on localhost.  Compare the resulting
@@ -47,9 +49,9 @@ void
 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));
+       BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
 
-       BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
+       BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size());
        BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
 }
 
@@ -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),
@@ -114,12 +115,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
        EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&EncodeServer::run, server));
+       thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 1);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -134,6 +136,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                delete *i;
        }
 
+       server->stop ();
+       server_thread->join ();
+       delete server_thread;
        delete server;
 }
 
@@ -166,7 +171,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),
@@ -194,12 +198,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
        EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&EncodeServer::run, server));
+       thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 2);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -214,6 +219,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                delete *i;
        }
 
+       server->stop ();
+       server_thread->join ();
+       delete server_thread;
        delete server;
 }
 
@@ -233,7 +241,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 +266,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),
@@ -286,12 +292,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
        EncodeServer* server = new EncodeServer (log, true, 2);
 
-       new thread (boost::bind (&EncodeServer::run, server));
+       thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
        /* Let the server get itself ready */
        dcpomatic_sleep (1);
 
-       EncodeServerDescription description ("localhost", 2);
+       /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+       EncodeServerDescription description ("127.0.0.1", 2);
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
@@ -306,5 +313,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                delete *i;
        }
 
+       server->stop ();
+       server_thread->join ();
+       delete server_thread;
        delete server;
 }