X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=806ec94642c0238afcd22428e27840551222b341;hb=3b80b8f8a938dd34ee0e0fbca8fbce6a6850f136;hp=8d4a5925f826d6641b57397ae2cdb46b638e14e5;hpb=15f23b356b757a9697bf1a9ec30c243ab8070404;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 8d4a5925f..806ec9464 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington Taken from code Copyright (C) 2010-2011 Terrence Meiczinger This program is free software; you can redistribute it and/or modify @@ -28,50 +28,45 @@ * of images that require encoding. */ +#include "dcp_video.h" +#include "config.h" +#include "exceptions.h" +#include "server.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 +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "film.h" -#include "dcp_video.h" -#include "config.h" -#include "exceptions.h" -#include "server.h" -#include "util.h" -#include "scaler.h" -#include "image.h" -#include "log.h" -#include "cross.h" -#include "player_video.h" #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); #include "i18n.h" using std::string; -using std::stringstream; using std::cout; using boost::shared_ptr; using boost::lexical_cast; using dcp::Size; -using dcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) @@ -82,13 +77,14 @@ using dcp::raw_convert; * @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, bool b, shared_ptr l ) : _frame (frame) , _index (index) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) , _resolution (r) + , _burn_subtitles (b) , _log (l) { @@ -102,34 +98,30 @@ DCPVideo::DCPVideo (shared_ptr frame, shared_ptrnumber_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 () +Data +DCPVideo::encode_locally (dcp::NoteHandler note) { - shared_ptr in_lut = dcp::GammaLUT::cache.get ( - 12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised - ); - - /* XXX: libdcp should probably use boost */ - - double matrix[3][3]; - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix[i][j] = _frame->colour_conversion().matrix (i, j); - } + shared_ptr xyz; + + shared_ptr image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note); + if (_frame->colour_conversion()) { + xyz = dcp::rgb_to_xyz ( + image->data()[0], + image->size(), + image->stride()[0], + _frame->colour_conversion().get(), + note + ); + } else { + xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]); } - shared_ptr xyz = dcp::rgb_to_xyz ( - _frame->image(), - in_lut, - dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false), - matrix - ); - /* 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) { @@ -245,7 +237,7 @@ DCPVideo::encode_locally () break; } - shared_ptr enc (new LocallyEncodedData (cio->buffer, cio_tell (cio))); + Data enc (cio->buffer, cio_tell (cio)); opj_cio_close (cio); free (parameters.cp_comment); @@ -258,7 +250,7 @@ DCPVideo::encode_locally () * @param serv Server to send to. * @return Encoded data. */ -shared_ptr +Data DCPVideo::encode_remotely (ServerDescription serv) { boost::asio::io_service io_service; @@ -279,19 +271,18 @@ DCPVideo::encode_remotely (ServerDescription serv) LOG_GENERAL (N_("Sending frame %1 to remote"), _index); /* Send XML metadata */ - stringstream xml; - doc.write_to_stream (xml, "UTF-8"); - socket->write (xml.str().length() + 1); - socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); + 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); + _frame->send_binary (socket, _burn_subtitles); /* 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()); + Data e (socket->read_uint32 ()); + socket->read (e.data().get(), e.size()); LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index); @@ -305,7 +296,8 @@ 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))); - _frame->add_metadata (el); + el->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0"); + _frame->add_metadata (el, _burn_subtitles); } Eyes @@ -314,90 +306,18 @@ DCPVideo::eyes () const return _frame->eyes (); } -EncodedData::EncodedData (int s) - : _data (new uint8_t[s]) - , _size (s) -{ - -} - -EncodedData::EncodedData (boost::filesystem::path file) -{ - _size = boost::filesystem::file_size (file); - _data = new uint8_t[_size]; - - FILE* f = fopen_boost (file, "rb"); - if (!f) { - throw FileError (_("could not open file for reading"), file); - } - - size_t const r = fread (_data, 1, _size, f); - if (r != size_t (_size)) { - fclose (f); - throw FileError (_("could not read encoded data"), file); - } - - fclose (f); -} - - -EncodedData::~EncodedData () -{ - delete[] _data; -} - -/** Write this data to a J2K file. - * @param Film Film. - * @param frame DCP frame index. +/** @return true if this DCPVideo is definitely the same as another; + * (apart from the frame index), false if it is probably not. */ -void -EncodedData::write (shared_ptr film, int frame, Eyes eyes) const +bool +DCPVideo::same (shared_ptr other) const { - boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true); - - FILE* f = fopen_boost (tmp_j2c, "wb"); - - if (!f) { - throw WriteFileError (tmp_j2c, errno); + if (_frames_per_second != other->_frames_per_second || + _j2k_bandwidth != other->_j2k_bandwidth || + _resolution != other->_resolution || + _burn_subtitles != other->_burn_subtitles) { + return false; } - fwrite (_data, 1, _size, f); - fclose (f); - - boost::filesystem::path const real_j2c = film->j2c_path (frame, eyes, false); - - /* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */ - boost::filesystem::rename (tmp_j2c, real_j2c); -} - -void -EncodedData::write_info (shared_ptr film, int frame, Eyes eyes, dcp::FrameInfo fin) const -{ - boost::filesystem::path const info = film->info_path (frame, eyes); - FILE* h = fopen_boost (info, "w"); - fin.write (h); - fclose (h); -} - -/** Send this data to a socket. - * @param socket Socket - */ -void -EncodedData::send (shared_ptr socket) -{ - socket->write (_size); - socket->write (_data, _size); -} - -LocallyEncodedData::LocallyEncodedData (uint8_t* d, int s) - : EncodedData (s) -{ - memcpy (_data, d, s); -} - -/** @param s Size of data in bytes */ -RemotelyEncodedData::RemotelyEncodedData (int s) - : EncodedData (s) -{ - + return _frame->same (other->_frame); }