projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update waf.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 51594a47acbd930347ded076aad887dadd9d8203..daa1fa20f37ba469a3f99f26eb315095a115276e 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-30,17
+30,19
@@
#include "lib/server.h"
#include "lib/image.h"
#include "lib/cross.h"
#include "lib/server.h"
#include "lib/image.h"
#include "lib/cross.h"
-#include "lib/dcp_video
_frame
.h"
+#include "lib/dcp_video.h"
#include "lib/scaler.h"
#include "lib/scaler.h"
-#include "lib/player_video_frame.h"
-#include "lib/image_proxy.h"
+#include "lib/player_video.h"
+#include "lib/raw_image_proxy.h"
+#include "lib/encoded_data.h"
using std::list;
using boost::shared_ptr;
using boost::thread;
using std::list;
using boost::shared_ptr;
using boost::thread;
+using boost::optional;
void
void
-do_remote_encode (shared_ptr<DCPVideo
Frame
> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
{
shared_ptr<EncodedData> remotely_encoded;
BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
{
shared_ptr<EncodedData> remotely_encoded;
BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@
-80,10
+82,12
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
- shared_ptr<PlayerVideoFrame> pvf (
- new PlayerVideoFrame (
- shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+ shared_ptr<PlayerVideo> pvf (
+ new PlayerVideo (
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
+ DCPTime (),
Crop (),
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"),
@@
-95,18
+99,19
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
- shared_ptr<DCPVideo
Frame
> frame (
- new DCPVideo
Frame
(
+ shared_ptr<DCPVideo> frame (
+ new DCPVideo (
pvf,
0,
24,
200000000,
RESOLUTION_2K,
pvf,
0,
24,
200000000,
RESOLUTION_2K,
+ true,
log
)
);
log
)
);
- 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);
@@
-161,10
+166,12
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
- shared_ptr<PlayerVideoFrame> pvf (
- new PlayerVideoFrame (
- shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+ shared_ptr<PlayerVideo> pvf (
+ new PlayerVideo (
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
+ DCPTime (),
Crop (),
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"),
@@
-176,18
+183,19
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
- shared_ptr<DCPVideo
Frame
> frame (
- new DCPVideo
Frame
(
+ shared_ptr<DCPVideo> frame (
+ new DCPVideo (
pvf,
0,
24,
200000000,
RESOLUTION_2K,
pvf,
0,
24,
200000000,
RESOLUTION_2K,
+ true,
log
)
);
log
)
);
- 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);