projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and general tidying.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index f518f938358ebd39881f77c9e8263eac5d9834a5..7a99f72274758a1bace8f1e9f637fe7e1c61d502 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-66,7
+66,7
@@
do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription descriptio
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
{
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
{
- auto image = make_shared<Image>(AV_PIX_FMT_RGB24, dcp::Size (1998, 1080),
true
);
+ auto image = make_shared<Image>(AV_PIX_FMT_RGB24, dcp::Size (1998, 1080),
Image::Alignment::PADDED
);
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
@@
-79,7
+79,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
p += image->stride()[0];
}
p += image->stride()[0];
}
- auto sub_image = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (100, 200),
true
);
+ auto sub_image = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (100, 200),
Image::Alignment::PADDED
);
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-153,7
+153,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
{
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
{
- auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080),
true
);
+ auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080),
Image::Alignment::PADDED
);
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
@@
-162,7
+162,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
}
}
}
}
- auto sub_image = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (100, 200),
true
);
+ auto sub_image = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (100, 200),
Image::Alignment::PADDED
);
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
@@
-236,7
+236,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
{
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
{
- auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080),
true
);
+ auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080),
Image::Alignment::PADDED
);
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];