X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=be69f3eedc1255740f221379b53c229a8833688b;hp=848a5393ce5c9a28195416298dbcad2ea6ef5418;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=dbf43f9113d88245f27493fd5d6950ba142b7f1f diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 848a5393c..be69f3eed 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -1,20 +1,20 @@ /* - Copyright (C) 2012-2015 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,27 +31,29 @@ #include "dcp_video.h" #include "config.h" #include "exceptions.h" -#include "server_description.h" +#include "encode_server_description.h" #include "dcpomatic_socket.h" #include "image.h" #include "log.h" #include "cross.h" #include "player_video.h" #include "raw_convert.h" -#include "data.h" #include "compose.hpp" #include #include #include +#include #include +#include #include +#include #include #include #include -#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); -#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE); -#define LOG_TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING); +#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_DEBUG_ENCODE); +#define LOG_TIMING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_TIMING); #include "i18n.h" @@ -59,6 +61,7 @@ using std::string; using std::cout; using boost::shared_ptr; using dcp::Size; +using dcp::Data; #define DCI_COEFFICENT (48.0 / 52.37) @@ -96,7 +99,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler { shared_ptr xyz; - shared_ptr image = frame->image (AV_PIX_FMT_RGB48LE, note); + shared_ptr image = frame->image (note, bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -118,108 +121,13 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler Data DCPVideo::encode_locally (dcp::NoteHandler note) { - shared_ptr xyz = convert_to_xyz (_frame, 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; - } - 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")); - } - - 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")); - } + Data enc = compress_j2k ( + convert_to_xyz (_frame, note), + _j2k_bandwidth, + _frames_per_second, + _frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT, + _resolution == RESOLUTION_4K + ); switch (_frame->eyes()) { case EYES_BOTH: @@ -235,12 +143,6 @@ DCPVideo::encode_locally (dcp::NoteHandler note) break; } - Data enc (cio->buffer, cio_tell (cio)); - - opj_cio_close (cio); - free (parameters.cp_comment); - opj_destroy_compress (cinfo); - return enc; } @@ -249,14 +151,14 @@ DCPVideo::encode_locally (dcp::NoteHandler note) * @return Encoded data. */ Data -DCPVideo::encode_remotely (ServerDescription serv) +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::iterator endpoint_iterator = resolver.resolve (query); - shared_ptr socket (new Socket); + shared_ptr socket (new Socket (timeout)); socket->connect (*endpoint_iterator);