summaryrefslogtreecommitdiff
path: root/test/client_server_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-24 01:05:14 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-24 23:34:36 +0000
commitd08123f5e160b5737fa912cd36119e810abaa4cd (patch)
tree1e3dd2a846f8fd67ef942d2689c73b4485b7a20f /test/client_server_test.cc
parent3e961894051327bb62f0d41f2d59e63212a6622f (diff)
Speed some operations by re-using the last PlayerVideo but with
updated metadata (where possible). Helps with #1194.
Diffstat (limited to 'test/client_server_test.cc')
-rw-r--r--test/client_server_test.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 074ca0c9e..b3d57e813 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -43,6 +43,7 @@ using std::list;
using boost::shared_ptr;
using boost::thread;
using boost::optional;
+using boost::weak_ptr;
using dcp::Data;
void
@@ -94,7 +95,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
@@ -177,7 +180,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
@@ -247,7 +252,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
@@ -273,7 +280,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- PresetColourConversion::all().front().conversion
+ PresetColourConversion::all().front().conversion,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);