X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=4f84a83027a209c6bc1177fecd9aa63035b71250;hb=bd8fa9a370f1739952c83107352baa08c79d095e;hp=8a4c845d987f701e16624f9cd0a23df9b19c6968;hpb=9f861f06506d0b1b50172f0defadc5bff3f76871;p=dcpomatic.git diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 8a4c845d9..4f84a8302 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -36,18 +36,17 @@ #include #include #include +#include #include #include -#ifdef DVDOMATIC_POSIX -#include -#include -#endif +#include +#include #include +#include #include "film.h" #include "dcp_video_frame.h" #include "lut.h" #include "config.h" -#include "film_state.h" #include "options.h" #include "exceptions.h" #include "server.h" @@ -55,10 +54,7 @@ #include "scaler.h" #include "image.h" #include "log.h" - -#ifdef DEBUG_HASH -#include -#endif +#include "subtitle.h" using namespace std; using namespace boost; @@ -76,10 +72,16 @@ using namespace boost; * @param l Log to write to. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr yuv, Size out, int p, Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l) + shared_ptr yuv, shared_ptr sub, + Size out, int p, int subtitle_offset, float subtitle_scale, + Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l + ) : _input (yuv) + , _subtitle (sub) , _out_size (out) , _padding (p) + , _subtitle_offset (subtitle_offset) + , _subtitle_scale (subtitle_scale) , _scaler (s) , _frame (f) /* we round here; not sure if this is right */ @@ -139,7 +141,6 @@ DCPVideoFrame::~DCPVideoFrame () if (_parameters) { free (_parameters->cp_comment); - free (_parameters->cp_matrice); } delete _parameters; @@ -151,17 +152,24 @@ DCPVideoFrame::~DCPVideoFrame () shared_ptr DCPVideoFrame::encode_locally () { - shared_ptr prepared = _input; - if (!_post_process.empty ()) { - prepared = prepared->post_process (_post_process); + _input = _input->post_process (_post_process); } - prepared = prepared->scale_and_convert_to_rgb (_out_size, _padding, _scaler); + shared_ptr prepared = _input->scale_and_convert_to_rgb (_out_size, _padding, _scaler); - create_openjpeg_container (); + if (_subtitle) { + Rect tx = subtitle_transformed_area ( + float (_out_size.width) / _input->size().width, + float (_out_size.height) / _input->size().height, + _subtitle->area(), _subtitle_offset, _subtitle_scale + ); + + shared_ptr im = _subtitle->image()->scale (tx.size(), _scaler); + prepared->alpha_blend (im, tx.position()); + } - int const size = _out_size.width * _out_size.height; + create_openjpeg_container (); struct { double r, g, b; @@ -173,27 +181,41 @@ DCPVideoFrame::encode_locally () /* Copy our RGB into the openjpeg container, converting to XYZ in the process */ - uint8_t* p = prepared->data()[0]; - for (int i = 0; i < size; ++i) { - /* In gamma LUT (converting 8-bit input to 12-bit) */ - s.r = lut_in[_colour_lut_index][*p++ << 4]; - s.g = lut_in[_colour_lut_index][*p++ << 4]; - s.b = lut_in[_colour_lut_index][*p++ << 4]; - - /* RGB to XYZ Matrix */ - d.x = ((s.r * color_matrix[_colour_lut_index][0][0]) + (s.g * color_matrix[_colour_lut_index][0][1]) + (s.b * color_matrix[_colour_lut_index][0][2])); - d.y = ((s.r * color_matrix[_colour_lut_index][1][0]) + (s.g * color_matrix[_colour_lut_index][1][1]) + (s.b * color_matrix[_colour_lut_index][1][2])); - d.z = ((s.r * color_matrix[_colour_lut_index][2][0]) + (s.g * color_matrix[_colour_lut_index][2][1]) + (s.b * color_matrix[_colour_lut_index][2][2])); - - /* DCI companding */ - d.x = d.x * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); - d.y = d.y * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); - d.z = d.z * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); - - /* Out gamma LUT */ - _image->comps[0].data[i] = lut_out[LO_DCI][(int) d.x]; - _image->comps[1].data[i] = lut_out[LO_DCI][(int) d.y]; - _image->comps[2].data[i] = lut_out[LO_DCI][(int) d.z]; + int jn = 0; + for (int y = 0; y < _out_size.height; ++y) { + uint8_t* p = prepared->data()[0] + y * prepared->stride()[0]; + for (int x = 0; x < _out_size.width; ++x) { + + /* In gamma LUT (converting 8-bit input to 12-bit) */ + s.r = lut_in[_colour_lut_index][*p++ << 4]; + s.g = lut_in[_colour_lut_index][*p++ << 4]; + s.b = lut_in[_colour_lut_index][*p++ << 4]; + + /* RGB to XYZ Matrix */ + d.x = ((s.r * color_matrix[_colour_lut_index][0][0]) + + (s.g * color_matrix[_colour_lut_index][0][1]) + + (s.b * color_matrix[_colour_lut_index][0][2])); + + d.y = ((s.r * color_matrix[_colour_lut_index][1][0]) + + (s.g * color_matrix[_colour_lut_index][1][1]) + + (s.b * color_matrix[_colour_lut_index][1][2])); + + d.z = ((s.r * color_matrix[_colour_lut_index][2][0]) + + (s.g * color_matrix[_colour_lut_index][2][1]) + + (s.b * color_matrix[_colour_lut_index][2][2])); + + /* DCI companding */ + d.x = d.x * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); + d.y = d.y * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); + d.z = d.z * DCI_COEFFICENT * (DCI_LUT_SIZE - 1); + + /* Out gamma LUT */ + _image->comps[0].data[jn] = lut_out[LO_DCI][(int) d.x]; + _image->comps[1].data[jn] = lut_out[LO_DCI][(int) d.y]; + _image->comps[2].data[jn] = lut_out[LO_DCI][(int) d.z]; + + ++jn; + } } /* Set the max image and component sizes based on frame_rate */ @@ -252,35 +274,27 @@ DCPVideoFrame::encode_locally () /* get a J2K compressor handle */ _cinfo = opj_create_compress (CODEC_J2K); + if (_cinfo == 0) { + throw EncodeError ("could not create JPEG2000 encoder"); + } /* Set event manager to null (openjpeg 1.3 bug) */ _cinfo->event_mgr = 0; -#ifdef DEBUG_HASH - md5_data ("J2K in X", _image->comps[0].data, size * sizeof (int)); - md5_data ("J2K in Y", _image->comps[1].data, size * sizeof (int)); - md5_data ("J2K in Z", _image->comps[2].data, size * sizeof (int)); -#endif - /* Setup the encoder parameters using the current image and user parameters */ opj_setup_encoder (_cinfo, _parameters, _image); _cio = opj_cio_open ((opj_common_ptr) _cinfo, 0, 0); + if (_cio == 0) { + throw EncodeError ("could not open JPEG2000 stream"); + } int const r = opj_encode (_cinfo, _cio, _image, 0); if (r == 0) { - throw EncodeError ("jpeg2000 encoding failed"); + throw EncodeError ("JPEG2000 encoding failed"); } -#ifdef DEBUG_HASH - md5_data ("J2K out", _cio->buffer, cio_tell (_cio)); -#endif - - { - stringstream s; - s << "Finished locally-encoded frame " << _frame << " length " << cio_tell (_cio); - _log->log (s.str ()); - } + _log->log (String::compose ("Finished locally-encoded frame %1", _frame)); return shared_ptr (new LocallyEncodedData (_cio->buffer, cio_tell (_cio))); } @@ -290,100 +304,63 @@ DCPVideoFrame::encode_locally () * @return Encoded data. */ shared_ptr -DCPVideoFrame::encode_remotely (Server const * serv) +DCPVideoFrame::encode_remotely (ServerDescription const * serv) { -#ifdef DVDOMATIC_POSIX - int const fd = socket (AF_INET, SOCK_STREAM, 0); - if (fd < 0) { - throw NetworkError ("could not create socket"); - } - - struct timeval tv; - tv.tv_sec = 20; - tv.tv_usec = 0; - - if (setsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, (void *) &tv, sizeof (tv)) < 0) { - close (fd); - throw NetworkError ("setsockopt failed"); - } - - if (setsockopt (fd, SOL_SOCKET, SO_SNDTIMEO, (void *) &tv, sizeof (tv)) < 0) { - close (fd); - throw NetworkError ("setsockopt failed"); - } - - struct hostent* server = gethostbyname (serv->host_name().c_str ()); - if (server == 0) { - close (fd); - throw NetworkError ("gethostbyname failed"); - } + asio::io_service io_service; + asio::ip::tcp::resolver resolver (io_service); + asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast (Config::instance()->server_port ())); + asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); - struct sockaddr_in server_address; - memset (&server_address, 0, sizeof (server_address)); - server_address.sin_family = AF_INET; - memcpy (&server_address.sin_addr.s_addr, server->h_addr, server->h_length); - server_address.sin_port = htons (Config::instance()->server_port ()); - if (connect (fd, (struct sockaddr *) &server_address, sizeof (server_address)) < 0) { - close (fd); - stringstream s; - s << "could not connect (" << strerror (errno) << ")"; - throw NetworkError (s.str()); - } + shared_ptr socket (new Socket); -#ifdef DEBUG_HASH - _input->hash ("Input for remote encoding (before sending)"); -#endif + socket->connect (*endpoint_iterator, 30); stringstream s; - s << "encode " - << _input->size().width << " " << _input->size().height << " " - << _input->pixel_format() << " " - << _out_size.width << " " << _out_size.height << " " - << _padding << " " - << _scaler->id () << " " - << _frame << " " - << _frames_per_second << " " - << (_post_process.empty() ? "none" : _post_process) << " " - << Config::instance()->colour_lut_index () << " " - << Config::instance()->j2k_bandwidth () << " "; - - for (int i = 0; i < _input->components(); ++i) { - s << _input->line_size()[i] << " "; + s << "encode please\n" + << "input_width " << _input->size().width << "\n" + << "input_height " << _input->size().height << "\n" + << "input_pixel_format " << _input->pixel_format() << "\n" + << "output_width " << _out_size.width << "\n" + << "output_height " << _out_size.height << "\n" + << "padding " << _padding << "\n" + << "subtitle_offset " << _subtitle_offset << "\n" + << "subtitle_scale " << _subtitle_scale << "\n" + << "scaler " << _scaler->id () << "\n" + << "frame " << _frame << "\n" + << "frames_per_second " << _frames_per_second << "\n"; + + if (!_post_process.empty()) { + s << "post_process " << _post_process << "\n"; + } + + s << "colour_lut " << Config::instance()->colour_lut_index () << "\n" + << "j2k_bandwidth " << Config::instance()->j2k_bandwidth () << "\n"; + + if (_subtitle) { + s << "subtitle_x " << _subtitle->position().x << "\n" + << "subtitle_y " << _subtitle->position().y << "\n" + << "subtitle_width " << _subtitle->image()->size().width << "\n" + << "subtitle_height " << _subtitle->image()->size().height << "\n"; } - socket_write (fd, (uint8_t *) s.str().c_str(), s.str().length() + 1); + socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); - for (int i = 0; i < _input->components(); ++i) { - socket_write (fd, _input->data()[i], _input->line_size()[i] * _input->lines(i)); + _input->write_to_socket (socket); + if (_subtitle) { + _subtitle->image()->write_to_socket (socket); } - SocketReader reader (fd); - char buffer[32]; - reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer)); - reader.consume (strlen (buffer) + 1); + socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); + socket->consume (strlen (buffer) + 1); shared_ptr e (new RemotelyEncodedData (atoi (buffer))); /* now read the rest */ - reader.read_definite_and_consume (e->data(), e->size()); - -#ifdef DEBUG_HASH - e->hash ("Encoded image (after receiving)"); -#endif + socket->read_definite_and_consume (e->data(), e->size(), 30); - { - stringstream s; - s << "Finished remotely-encoded frame " << _frame << " length " << e->size(); - _log->log (s.str ()); - } + _log->log (String::compose ("Finished remotely-encoded frame %1", _frame)); - close (fd); return e; -#endif - -#ifdef DVDOMATIC_WINDOWS - return shared_ptr (); -#endif } /** Write this data to a J2K file. @@ -404,31 +381,29 @@ EncodedData::write (shared_ptr opt, int frame) fwrite (_data, 1, _size, f); fclose (f); + string const real_j2k = opt->frame_out_path (frame, false); + /* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */ - filesystem::rename (tmp_j2k, opt->frame_out_path (frame, false)); + filesystem::rename (tmp_j2k, real_j2k); + + /* Write a file containing the hash */ + string const hash = real_j2k + ".md5"; + ofstream h (hash.c_str()); + h << md5_digest (_data, _size) << "\n"; + h.close (); } -#ifdef DVDOMATIC_POSIX -/** Send this data to a file descriptor. - * @param fd File descriptor. +/** Send this data to a socket. + * @param socket Socket */ void -EncodedData::send (int fd) +EncodedData::send (shared_ptr socket) { stringstream s; s << _size; - socket_write (fd, (uint8_t *) s.str().c_str(), s.str().length() + 1); - socket_write (fd, _data, _size); -} -#endif - -#ifdef DEBUG_HASH -void -EncodedData::hash (string n) const -{ - md5_data (n, _data, _size); + socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + socket->write (_data, _size, 30); } -#endif /** @param s Size of data in bytes */ RemotelyEncodedData::RemotelyEncodedData (int s)