#include "image.h"
#include "dcp_video_frame.h"
#include "config.h"
+#include "subtitle.h"
using namespace std;
using namespace boost;
}
int
-Server::process (shared_ptr<asio::ip::tcp::socket> socket)
+Server::process (shared_ptr<Socket> socket)
{
- DeadlineWrapper wrapper (_io_service);
- wrapper.set_socket (socket);
-
- char buffer[128];
- wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
- wrapper.consume (strlen (buffer) + 1);
+ char buffer[256];
+ socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
+ socket->consume (strlen (buffer) + 1);
stringstream s (buffer);
-
+
string command;
s >> command;
if (command != "encode") {
return -1;
}
-
+
Size in_size;
int pixel_format_int;
Size out_size;
int padding;
+ int subtitle_offset;
+ int subtitle_scale;
string scaler_id;
int frame;
float frames_per_second;
string post_process;
int colour_lut_index;
int j2k_bandwidth;
+ Position subtitle_position;
+ Size subtitle_size;
s >> in_size.width >> in_size.height
>> pixel_format_int
>> out_size.width >> out_size.height
>> padding
+ >> subtitle_offset
+ >> subtitle_scale
>> scaler_id
>> frame
>> frames_per_second
>> post_process
>> colour_lut_index
- >> j2k_bandwidth;
-
+ >> j2k_bandwidth
+ >> subtitle_position.x >> subtitle_position.y
+ >> subtitle_size.width >> subtitle_size.height;
+
PixelFormat pixel_format = (PixelFormat) pixel_format_int;
Scaler const * scaler = Scaler::from_id (scaler_id);
if (post_process == "none") {
post_process = "";
}
- shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
-
- for (int i = 0; i < image->components(); ++i) {
- int line_size;
- s >> line_size;
- image->set_line_size (i, line_size);
- }
-
- for (int i = 0; i < image->components(); ++i) {
- wrapper.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
+ shared_ptr<Image> image (new AlignedImage (pixel_format, in_size));
+
+ image->read_from_socket (socket);
+
+ shared_ptr<Subtitle> sub;
+ if (subtitle_position.x != -1) {
+ shared_ptr<Image> subtitle_image (new AlignedImage (PIX_FMT_RGBA, subtitle_size));
+ subtitle_image->read_from_socket (socket);
+ sub.reset (new Subtitle (subtitle_position, subtitle_image));
}
+
+ DCPVideoFrame dcp_video_frame (
+ image, sub, out_size, padding, subtitle_offset, subtitle_scale,
+ scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log
+ );
-#ifdef DEBUG_HASH
- image->hash ("Image for encoding (as received by server)");
-#endif
-
- DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log);
shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
encoded->send (socket);
-#ifdef DEBUG_HASH
- encoded->hash ("Encoded image (as made by server and as sent back)");
-#endif
-
return frame;
}
_worker_condition.wait (lock);
}
- shared_ptr<asio::ip::tcp::socket> socket = _queue.front ();
+ shared_ptr<Socket> socket = _queue.front ();
_queue.pop_front ();
lock.unlock ();
if (frame >= 0) {
struct timeval end;
gettimeofday (&end, 0);
- cout << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start)) << "\n";
+ _log->log (String::compose ("Encoded frame %1 in %2", frame, seconds (end) - seconds (start)));
}
_worker_condition.notify_all ();
void
Server::run (int num_threads)
{
- cout << "Server starting with " << num_threads << " threads.\n";
+ _log->log (String::compose ("Server starting with %1 threads", num_threads));
for (int i = 0; i < num_threads; ++i) {
_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));
}
-
- asio::ip::tcp::acceptor acceptor (_io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
+
+ asio::io_service io_service;
+ asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
while (1) {
- shared_ptr<asio::ip::tcp::socket> socket (new asio::ip::tcp::socket (_io_service));
- acceptor.accept (*socket);
+ shared_ptr<Socket> socket (new Socket);
+ acceptor.accept (socket->socket ());
mutex::scoped_lock lock (_worker_mutex);