projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 1.0
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 1816de8e693df8a1a4fac0bf29e324a12efede53..4e3ecc983a75524d20582b135ed29b73c08e2bff 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-30,17
+30,18
@@
#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;
void
using std::list;
using boost::shared_ptr;
using boost::thread;
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,9
+81,10
@@
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<PlayerVideo
Frame
> pvf (
- new PlayerVideo
Frame
(
+ shared_ptr<PlayerVideo> pvf (
+ new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+ DCPTime (),
Crop (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Crop (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
@@
-95,13
+97,14
@@
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
)
);
@@
-130,6
+133,8
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
delete *i;
}
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
delete *i;
}
+
+ delete server;
}
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
}
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
@@
-159,9
+164,10
@@
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<PlayerVideo
Frame
> pvf (
- new PlayerVideo
Frame
(
+ shared_ptr<PlayerVideo> pvf (
+ new PlayerVideo (
shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+ DCPTime (),
Crop (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
Crop (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
@@
-174,13
+180,14
@@
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
)
);
@@
-209,5
+216,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
delete *i;
}
for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
delete *i;
}
+
+ delete server;
}
}