projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply the remainder of a 1.x patch; a test.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 4e3ecc983a75524d20582b135ed29b73c08e2bff..daa1fa20f37ba469a3f99f26eb315095a115276e 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-39,6
+39,7
@@
using std::list;
using boost::shared_ptr;
using boost::thread;
using std::list;
using boost::shared_ptr;
using boost::thread;
+using boost::optional;
void
do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
void
do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
@@
-83,9
+84,10
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
- shared_ptr<ImageProxy> (new RawImageProxy (image
, log
)),
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
DCPTime (),
Crop (),
DCPTime (),
Crop (),
+ optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Scaler::from_id ("bicubic"),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Scaler::from_id ("bicubic"),
@@
-109,7
+111,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
)
);
)
);
- shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+ shared_ptr<EncodedData> locally_encoded = frame->encode_locally (
boost::bind (&Log::dcp_log, log.get(), _1, _2)
);
BOOST_ASSERT (locally_encoded);
Server* server = new Server (log, true);
BOOST_ASSERT (locally_encoded);
Server* server = new Server (log, true);
@@
-166,9
+168,10
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
- shared_ptr<ImageProxy> (new RawImageProxy (image
, log
)),
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
DCPTime (),
Crop (),
DCPTime (),
Crop (),
+ optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Scaler::from_id ("bicubic"),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Scaler::from_id ("bicubic"),
@@
-192,7
+195,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
)
);
)
);
- shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+ shared_ptr<EncodedData> locally_encoded = frame->encode_locally (
boost::bind (&Log::dcp_log, log.get(), _1, _2)
);
BOOST_ASSERT (locally_encoded);
Server* server = new Server (log, true);
BOOST_ASSERT (locally_encoded);
Server* server = new Server (log, true);