/*
- 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
+ * @ingroup feature
*
* 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 "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
using boost::thread;
using boost::optional;
using boost::weak_ptr;
-using dcp::Data;
+using dcp::ArrayData;
void
-do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, ArrayData locally_encoded)
{
- Data remotely_encoded;
- BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+ ArrayData remotely_encoded;
+ BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200));
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_CHECK_EQUAL (memcmp (locally_encoded.data(), remotely_encoded.data(), locally_encoded.size()), 0);
}
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
p += sub_image->stride()[0];
}
- shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_rgb.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
EYES_BOTH,
PART_WHOLE,
ColourConversion(),
+ VIDEO_RANGE_FULL,
weak_ptr<Content>(),
- optional<Frame>()
+ optional<Frame>(),
+ false
)
);
- 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));
+ ArrayData locally_encoded = frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
p += sub_image->stride()[0];
}
- shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_yuv.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
EYES_BOTH,
PART_WHOLE,
ColourConversion(),
+ VIDEO_RANGE_FULL,
weak_ptr<Content>(),
- optional<Frame>()
+ optional<Frame>(),
+ false
)
);
- 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));
+ ArrayData locally_encoded = frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
}
}
- shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_j2k.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_j2k.log")));
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
EYES_BOTH,
PART_WHOLE,
ColourConversion(),
+ VIDEO_RANGE_FULL,
weak_ptr<Content>(),
- optional<Frame>()
+ optional<Frame>(),
+ false
)
);
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));
+ ArrayData raw_locally_encoded = raw_frame->encode_locally ();
shared_ptr<PlayerVideo> j2k_pvf (
new PlayerVideo (
EYES_BOTH,
PART_WHOLE,
PresetColourConversion::all().front().conversion,
+ VIDEO_RANGE_FULL,
weak_ptr<Content>(),
- optional<Frame>()
+ optional<Frame>(),
+ false
)
);
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));
+ ArrayData j2k_locally_encoded = j2k_frame->encode_locally ();
- EncodeServer* server = new EncodeServer (log, true, 2);
+ EncodeServer* server = new EncodeServer (true, 2);
thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
/* Let the server get itself ready */
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);