X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=5416f2ae76cfdfc5fa6bc09d0c382021e5f35e54;hp=559aef7c6105ac47ec8f4f43c90c2deb9c99ed47;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=77f7f3be256f81d2977bccdb236582e18a625ba7 diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 559aef7c6..5416f2ae7 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -1,20 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington - Taken from code Copyright (C) 2010-2011 Terrence Meiczinger + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -31,43 +31,33 @@ #include "dcp_video.h" #include "config.h" #include "exceptions.h" -#include "server.h" -#include "util.h" -#include "scaler.h" +#include "encode_server_description.h" +#include "dcpomatic_socket.h" #include "image.h" #include "log.h" +#include "dcpomatic_log.h" #include "cross.h" #include "player_video.h" -#include "encoded_data.h" +#include "compose.hpp" #include -#include -#include -#include #include -#include +#include +#include +#include +#include #include -#include -#include +#include #include -#include -#include -#include -#include #include #include -#include -#include -#include - -#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); #include "i18n.h" using std::string; using std::cout; using boost::shared_ptr; -using boost::lexical_cast; using dcp::Size; +using dcp::Data; using dcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) @@ -76,187 +66,94 @@ using dcp::raw_convert; * @param frame Input frame. * @param index Index of the frame within the DCP. * @param bw J2K bandwidth to use (see Config::j2k_bandwidth ()) - * @param l Log to write to. */ DCPVideo::DCPVideo ( - shared_ptr frame, int index, int dcp_fps, int bw, Resolution r, bool b, shared_ptr l + shared_ptr frame, int index, int dcp_fps, int bw, Resolution r ) : _frame (frame) , _index (index) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _resolution (r) - , _burn_subtitles (b) - , _log (l) { - + } -DCPVideo::DCPVideo (shared_ptr frame, shared_ptr node, shared_ptr log) +DCPVideo::DCPVideo (shared_ptr frame, shared_ptr node) : _frame (frame) - , _log (log) { _index = node->number_child ("Index"); _frames_per_second = node->number_child ("FramesPerSecond"); _j2k_bandwidth = node->number_child ("J2KBandwidth"); _resolution = Resolution (node->optional_number_child("Resolution").get_value_or (RESOLUTION_2K)); - _burn_subtitles = node->bool_child ("BurnSubtitles"); } -/** J2K-encode this frame on the local host. - * @return Encoded data. - */ -shared_ptr -DCPVideo::encode_locally (dcp::NoteHandler note) +shared_ptr +DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler note) { - shared_ptr xyz; + shared_ptr xyz; - if (_frame->colour_conversion()) { + shared_ptr image = frame->image (bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false); + if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( - _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note), - _frame->colour_conversion().get() + image->data()[0], + image->size(), + image->stride()[0], + frame->colour_conversion().get(), + note ); } else { - xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note)); - } - - /* Set the max image and component sizes based on frame_rate */ - int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second; - if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) { - /* In 3D we have only half the normal bandwidth per eye */ - max_cs_len /= 2; + xyz.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0])); } - int const max_comp_size = max_cs_len / 1.25; - /* get a J2K compressor handle */ - opj_cinfo_t* cinfo = opj_create_compress (CODEC_J2K); - if (cinfo == 0) { - throw EncodeError (N_("could not create JPEG2000 encoder")); - } - - /* Set encoding parameters to default values */ - opj_cparameters_t parameters; - opj_set_default_encoder_parameters (¶meters); - - /* Set default cinema parameters */ - parameters.tile_size_on = false; - parameters.cp_tdx = 1; - parameters.cp_tdy = 1; - - /* Tile part */ - parameters.tp_flag = 'C'; - parameters.tp_on = 1; - - /* Tile and Image shall be at (0,0) */ - parameters.cp_tx0 = 0; - parameters.cp_ty0 = 0; - parameters.image_offset_x0 = 0; - parameters.image_offset_y0 = 0; - - /* Codeblock size = 32x32 */ - parameters.cblockw_init = 32; - parameters.cblockh_init = 32; - parameters.csty |= 0x01; - - /* The progression order shall be CPRL */ - parameters.prog_order = CPRL; - - /* No ROI */ - parameters.roi_compno = -1; - - parameters.subsampling_dx = 1; - parameters.subsampling_dy = 1; - - /* 9-7 transform */ - parameters.irreversible = 1; - - parameters.tcp_rates[0] = 0; - parameters.tcp_numlayers++; - parameters.cp_disto_alloc = 1; - parameters.cp_rsiz = _resolution == RESOLUTION_2K ? CINEMA2K : CINEMA4K; - if (_resolution == RESOLUTION_4K) { - parameters.numpocs = 2; - parameters.POC[0].tile = 1; - parameters.POC[0].resno0 = 0; - parameters.POC[0].compno0 = 0; - parameters.POC[0].layno1 = 1; - parameters.POC[0].resno1 = parameters.numresolution - 1; - parameters.POC[0].compno1 = 3; - parameters.POC[0].prg1 = CPRL; - parameters.POC[1].tile = 1; - parameters.POC[1].resno0 = parameters.numresolution - 1; - parameters.POC[1].compno0 = 0; - parameters.POC[1].layno1 = 1; - parameters.POC[1].resno1 = parameters.numresolution; - parameters.POC[1].compno1 = 3; - parameters.POC[1].prg1 = CPRL; - } - - parameters.cp_comment = strdup (N_("DCP-o-matic")); - parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24; - - /* 3 components, so use MCT */ - parameters.tcp_mct = 1; - - /* set max image */ - parameters.max_comp_size = max_comp_size; - parameters.tcp_rates[0] = ((float) (3 * xyz->size().width * xyz->size().height * 12)) / (max_cs_len * 8); - - /* Set event manager to null (openjpeg 1.3 bug) */ - cinfo->event_mgr = 0; - - /* Setup the encoder parameters using the current image and user parameters */ - opj_setup_encoder (cinfo, ¶meters, xyz->opj_image ()); - - opj_cio_t* cio = opj_cio_open ((opj_common_ptr) cinfo, 0, 0); - if (cio == 0) { - opj_destroy_compress (cinfo); - throw EncodeError (N_("could not open JPEG2000 stream")); - } + return xyz; +} - int const r = opj_encode (cinfo, cio, xyz->opj_image(), 0); - if (r == 0) { - opj_cio_close (cio); - opj_destroy_compress (cinfo); - throw EncodeError (N_("JPEG2000 encoding failed")); - } +/** J2K-encode this frame on the local host. + * @return Encoded data. + */ +Data +DCPVideo::encode_locally () +{ + Data enc = compress_j2k ( + convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)), + _j2k_bandwidth, + _frames_per_second, + _frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT, + _resolution == RESOLUTION_4K + ); switch (_frame->eyes()) { case EYES_BOTH: - LOG_GENERAL (N_("Finished locally-encoded frame %1 for mono"), _index); + LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for mono"), _index); break; case EYES_LEFT: - LOG_GENERAL (N_("Finished locally-encoded frame %1 for L"), _index); + LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for L"), _index); break; case EYES_RIGHT: - LOG_GENERAL (N_("Finished locally-encoded frame %1 for R"), _index); + LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for R"), _index); break; default: break; } - shared_ptr enc (new LocallyEncodedData (cio->buffer, cio_tell (cio))); - - opj_cio_close (cio); - free (parameters.cp_comment); - opj_destroy_compress (cinfo); - return enc; } /** Send this frame to a remote server for J2K encoding, then read the result. * @param serv Server to send to. + * @param timeout timeout in seconds. * @return Encoded data. */ -shared_ptr -DCPVideo::encode_remotely (ServerDescription serv) +Data +DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (Config::instance()->server_port_base ())); + boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert (ENCODE_FRAME_PORT)); boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); - shared_ptr socket (new Socket); + shared_ptr socket (new Socket (timeout)); socket->connect (*endpoint_iterator); @@ -266,24 +163,36 @@ DCPVideo::encode_remotely (ServerDescription serv) root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); add_metadata (root); - LOG_GENERAL (N_("Sending frame %1 to remote"), _index); - - /* Send XML metadata */ - string xml = doc.write_to_string ("UTF-8"); - socket->write (xml.length() + 1); - socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); + LOG_DEBUG_ENCODE (N_("Sending frame %1 to remote"), _index); + + { + Socket::WriteDigestScope ds (socket); + + /* Send XML metadata */ + string xml = doc.write_to_string ("UTF-8"); + socket->write (xml.length() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); - /* Send binary data */ - _frame->send_binary (socket, _burn_subtitles); + /* Send binary data */ + LOG_TIMING("start-remote-send thread=%1", thread_id ()); + _frame->write_to_socket (socket); + } /* Read the response (JPEG2000-encoded data); this blocks until the data is ready and sent back. */ - shared_ptr e (new RemotelyEncodedData (socket->read_uint32 ())); - socket->read (e->data(), e->size()); + Socket::ReadDigestScope ds (socket); + LOG_TIMING("start-remote-encode thread=%1", thread_id ()); + Data e (socket->read_uint32 ()); + LOG_TIMING("start-remote-receive thread=%1", thread_id ()); + socket->read (e.data().get(), e.size()); + LOG_TIMING("finish-remote-receive thread=%1", thread_id ()); + if (!ds.check()) { + throw NetworkError ("Checksums do not match"); + } + + LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index); - LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index); - return e; } @@ -294,8 +203,7 @@ DCPVideo::add_metadata (xmlpp::Element* el) const el->add_child("FramesPerSecond")->add_child_text (raw_convert (_frames_per_second)); el->add_child("J2KBandwidth")->add_child_text (raw_convert (_j2k_bandwidth)); el->add_child("Resolution")->add_child_text (raw_convert (int (_resolution))); - el->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0"); - _frame->add_metadata (el, _burn_subtitles); + _frame->add_metadata (el); } Eyes @@ -312,8 +220,7 @@ DCPVideo::same (shared_ptr other) const { if (_frames_per_second != other->_frames_per_second || _j2k_bandwidth != other->_j2k_bandwidth || - _resolution != other->_resolution || - _burn_subtitles != other->_burn_subtitles) { + _resolution != other->_resolution) { return false; }