projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 0154200ad054c5a5ff1a024c76cf7c6ec56e06c8..9ad36138746e54877cf697608a889d9f8ffdc16a 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-31,7
+31,6
@@
#include "lib/image.h"
#include "lib/cross.h"
#include "lib/dcp_video.h"
#include "lib/image.h"
#include "lib/cross.h"
#include "lib/dcp_video.h"
-#include "lib/scaler.h"
#include "lib/player_video.h"
#include "lib/raw_image_proxy.h"
#include "lib/encoded_data.h"
#include "lib/player_video.h"
#include "lib/raw_image_proxy.h"
#include "lib/encoded_data.h"
@@
-84,13
+83,12
@@
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 (),
optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
DCPTime (),
Crop (),
optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
- Scaler::from_id ("bicubic"),
EYES_BOTH,
PART_WHOLE,
ColourConversion ()
EYES_BOTH,
PART_WHOLE,
ColourConversion ()
@@
-111,7
+109,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);
@@
-168,13
+166,12
@@
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 (),
optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
DCPTime (),
Crop (),
optional<float> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
- Scaler::from_id ("bicubic"),
EYES_BOTH,
PART_WHOLE,
ColourConversion ()
EYES_BOTH,
PART_WHOLE,
ColourConversion ()
@@
-195,7
+192,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);