X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=6f32b6686dca1ac44eeeb4d8d7a575f4c1e004fe;hb=0dca360f831aa51a4c0a33caa18e78c07391f3b7;hp=7987f92b4b5b59f1b06d54f639e00edaa197f3b6;hpb=53ca2dda0e9138a251adc186a745f7943fc1abc1;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 7987f92b4..6f32b6686 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,19 +31,19 @@ #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 "dcpomatic_log.h" #include "cross.h" #include "player_video.h" -#include "raw_convert.h" #include "compose.hpp" #include +#include #include #include #include -#include #include #include #include @@ -51,10 +51,6 @@ #include #include -#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" using std::string; @@ -62,6 +58,7 @@ using std::cout; using boost::shared_ptr; using dcp::Size; using dcp::Data; +using dcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) @@ -69,24 +66,21 @@ using dcp::Data; * @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, 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) - , _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"); @@ -99,7 +93,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler { shared_ptr xyz; - shared_ptr image = frame->image (note); + shared_ptr image = frame->image (bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -109,7 +103,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler note ); } else { - xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]); + xyz.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0])); } return xyz; @@ -119,12 +113,10 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler * @return Encoded data. */ Data -DCPVideo::encode_locally (dcp::NoteHandler note) +DCPVideo::encode_locally () { - shared_ptr xyz = convert_to_xyz (_frame, note); - Data enc = compress_j2k ( - convert_to_xyz (_frame, note), + 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, @@ -150,14 +142,15 @@ DCPVideo::encode_locally (dcp::NoteHandler note) /** 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. */ Data -DCPVideo::encode_remotely (ServerDescription serv, int timeout) +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 (timeout)); @@ -178,17 +171,17 @@ DCPVideo::encode_remotely (ServerDescription serv, int timeout) socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); /* Send binary data */ - LOG_TIMING("start-remote-send thread=%1", boost::this_thread::get_id()); + LOG_TIMING("start-remote-send thread=%1", thread_id ()); _frame->send_binary (socket); /* Read the response (JPEG2000-encoded data); this blocks until the data is ready and sent back. */ - LOG_TIMING("start-remote-encode thread=%1", boost::this_thread::get_id ()); + LOG_TIMING("start-remote-encode thread=%1", thread_id ()); Data e (socket->read_uint32 ()); - LOG_TIMING("start-remote-receive thread=%1", boost::this_thread::get_id ()); + LOG_TIMING("start-remote-receive thread=%1", thread_id ()); socket->read (e.data().get(), e.size()); - LOG_TIMING("finish-remote-receive thread=%1", boost::this_thread::get_id ()); + LOG_TIMING("finish-remote-receive thread=%1", thread_id ()); LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);