/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
/** @file test/client_server_test.cc
* @brief Test the server class.
+ * @ingroup specific
*
* Create a test image and then encode it using the standard mechanism
* and also using a EncodeServer object running on localhost. Compare the resulting
#include "lib/j2k_image_proxy.h"
#include "lib/encode_server_description.h"
#include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
-#include <boost/make_shared.hpp>
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
using boost::thread;
using boost::optional;
+using boost::weak_ptr;
using dcp::Data;
void
do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
{
Data remotely_encoded;
- BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+ BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200));
- BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
+ BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size());
BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
}
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
{
- shared_ptr<Image> image = make_shared<Image> (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true);
+ shared_ptr<Image> image (new Image (AV_PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
uint8_t* p = image->data()[0];
for (int y = 0; y < 1080; ++y) {
p += image->stride()[0];
}
- shared_ptr<Image> sub_image = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true);
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
p += sub_image->stride()[0];
}
- shared_ptr<FileLog> log = make_shared<FileLog> ("build/test/client_server_test_rgb.log");
+ dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log"));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
- make_shared<RawImageProxy> (image),
- DCPTime (),
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ VIDEO_RANGE_FULL,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
0,
24,
200000000,
- RESOLUTION_2K,
- log
+ RESOLUTION_2K
)
);
- Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+ Data locally_encoded = frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+ thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
{
- shared_ptr<Image> image = make_shared<Image> (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true);
+ shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
}
}
- shared_ptr<Image> sub_image = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true);
+ shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true));
uint8_t* p = sub_image->data()[0];
for (int y = 0; y < 200; ++y) {
uint8_t* q = p;
p += sub_image->stride()[0];
}
- shared_ptr<FileLog> log = make_shared<FileLog> ("build/test/client_server_test_yuv.log");
+ dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log"));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
- make_shared<RawImageProxy> (image),
- DCPTime (),
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ VIDEO_RANGE_FULL,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
0,
24,
200000000,
- RESOLUTION_2K,
- log
+ RESOLUTION_2K
)
);
- Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+ Data locally_encoded = frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+ thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
{
- shared_ptr<Image> image = make_shared<Image> (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true);
+ shared_ptr<Image> image (new Image (AV_PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
for (int i = 0; i < image->planes(); ++i) {
uint8_t* p = image->data()[i];
}
}
- shared_ptr<FileLog> log = make_shared<FileLog> ("build/test/client_server_test_j2k.log");
+ dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log"));
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
- make_shared<RawImageProxy> (image),
- DCPTime (),
+ shared_ptr<ImageProxy> (new RawImageProxy (image)),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ VIDEO_RANGE_FULL,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
0,
24,
200000000,
- RESOLUTION_2K,
- log
+ RESOLUTION_2K
)
);
- Data raw_locally_encoded = raw_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+ Data raw_locally_encoded = raw_frame->encode_locally ();
shared_ptr<PlayerVideo> j2k_pvf (
new PlayerVideo (
- /* This J2KImageProxy constructor is private, so no make_shared */
- shared_ptr<J2KImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080))),
- DCPTime (),
+ shared_ptr<ImageProxy> (new J2KImageProxy (raw_locally_encoded, dcp::Size (1998, 1080), AV_PIX_FMT_XYZ12LE)),
Crop (),
optional<double> (),
dcp::Size (1998, 1080),
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- PresetColourConversion::all().front().conversion
+ PresetColourConversion::all().front().conversion,
+ VIDEO_RANGE_FULL,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
0,
24,
200000000,
- RESOLUTION_2K,
- log
+ RESOLUTION_2K
)
);
- Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+ Data j2k_locally_encoded = j2k_frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
- new thread (boost::bind (&EncodeServer::run, server));
+ thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
- EncodeServerDescription description ("localhost", 2);
+ /* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
delete *i;
}
+ server->stop ();
+ server_thread->join ();
+ delete server_thread;
delete server;
}
projects / dcpomatic.git / blobdiff