Default to SMPTE for tests.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e7502af0eadd12c053b634ff5a2d69e2b76352c2..e21f41c7998163ec7c5290e1b6aa0b3ba16797aa 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -86,7 +87,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),
@@ -166,7 +166,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),
@@ -233,7 +232,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 +257,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),