X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=76989d078d3c07eb53030d41f32f06001b1702e6;hb=cc4a67b7eb8ecaed076e261960848f70e3e741af;hp=28236e3e04804e39ccab9b5167e7d2de7101f193;hpb=d382f34db155ddaf4bb61538c18b87c7564e00b2;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index 28236e3e0..76989d078 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -114,17 +114,15 @@ Server::process (shared_ptr socket) shared_ptr 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) { socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30); } + + /* XXX: subtitle */ + DCPVideoFrame dcp_video_frame ( + image, shared_ptr (), out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log + ); - DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log); shared_ptr encoded = dcp_video_frame.encode_locally (); encoded->send (socket);