X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.cc;h=59f356a5a78b297e0f54da14143a8ef43e2345a1;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=679a0490e8850955a782e76a0ccd387c96254ba4;hpb=bdbb254c18b100f8fa66a3707f6b515309d05685;p=dcpomatic.git diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 679a0490e..59f356a5a 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington Taken from code Copyright (C) 2010-2011 Terrence Meiczinger This program is free software; you can redistribute it and/or modify @@ -43,12 +43,11 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "film.h" #include "dcp_video_frame.h" @@ -68,7 +67,8 @@ using std::stringstream; using std::cout; using boost::shared_ptr; using boost::lexical_cast; -using libdcp::Size; +using dcp::Size; +using dcp::raw_convert; #define DCI_COEFFICENT (48.0 / 52.37) @@ -79,7 +79,7 @@ using libdcp::Size; * @param l Log to write to. */ DCPVideoFrame::DCPVideoFrame ( - shared_ptr image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, shared_ptr l + shared_ptr image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, Resolution r, shared_ptr l ) : _image (image) , _frame (f) @@ -87,6 +87,7 @@ DCPVideoFrame::DCPVideoFrame ( , _conversion (c) , _frames_per_second (dcp_fps) , _j2k_bandwidth (bw) + , _resolution (r) , _log (l) { @@ -110,6 +111,7 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr image, shared_ptrnode_child ("ColourConversion")); _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)); } /** J2K-encode this frame on the local host. @@ -118,12 +120,8 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr image, shared_ptr DCPVideoFrame::encode_locally () { - shared_ptr in_lut; - if (_conversion.input_gamma_linearised) { - in_lut = libdcp::SRGBLinearisedGammaLUT::cache.get (12, _conversion.input_gamma); - } else { - in_lut = libdcp::GammaLUT::cache.get (12, _conversion.input_gamma); - } + shared_ptr in_lut; + in_lut = dcp::GammaLUT::cache.get (12, _conversion.input_gamma, _conversion.input_gamma_linearised); /* XXX: libdcp should probably use boost */ @@ -134,10 +132,10 @@ DCPVideoFrame::encode_locally () } } - shared_ptr xyz = libdcp::rgb_to_xyz ( + shared_ptr xyz = dcp::rgb_to_xyz ( _image, in_lut, - libdcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma), + dcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma, false), matrix ); @@ -194,9 +192,27 @@ DCPVideoFrame::encode_locally () parameters.tcp_rates[0] = 0; parameters.tcp_numlayers++; parameters.cp_disto_alloc = 1; - parameters.cp_rsiz = CINEMA2K; + 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 = CINEMA2K_24; + parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24; /* 3 components, so use MCT */ parameters.tcp_mct = 1; @@ -256,7 +272,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); - boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast (Config::instance()->server_port_base ())); + 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); @@ -266,20 +282,15 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); - root->add_child("Version")->add_child_text (lexical_cast (SERVER_LINK_VERSION)); - root->add_child("Width")->add_child_text (lexical_cast (_image->size().width)); - root->add_child("Height")->add_child_text (lexical_cast (_image->size().height)); + root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); + root->add_child("Width")->add_child_text (raw_convert (_image->size().width)); + root->add_child("Height")->add_child_text (raw_convert (_image->size().height)); add_metadata (root); stringstream xml; doc.write_to_stream (xml, "UTF-8"); - _log->log (String::compose ( - N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"), - _image->pixel_format(), _image->components(), - _image->lines(0), _image->lines(1), _image->lines(2), - _image->line_size()[0], _image->line_size()[1], _image->line_size()[2] - )); + _log->log (String::compose (N_("Sending frame %1 to remote"), _frame)); socket->write (xml.str().length() + 1); socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); @@ -297,7 +308,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv) void DCPVideoFrame::add_metadata (xmlpp::Element* el) const { - el->add_child("Frame")->add_child_text (lexical_cast (_frame)); + el->add_child("Frame")->add_child_text (raw_convert (_frame)); switch (_eyes) { case EYES_BOTH: @@ -315,8 +326,9 @@ DCPVideoFrame::add_metadata (xmlpp::Element* el) const _conversion.as_xml (el->add_child("ColourConversion")); - el->add_child("FramesPerSecond")->add_child_text (lexical_cast (_frames_per_second)); - el->add_child("J2KBandwidth")->add_child_text (lexical_cast (_j2k_bandwidth)); + 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))); } EncodedData::EncodedData (int s) @@ -331,7 +343,7 @@ EncodedData::EncodedData (boost::filesystem::path file) _size = boost::filesystem::file_size (file); _data = new uint8_t[_size]; - FILE* f = fopen (file.string().c_str(), N_("rb")); + FILE* f = fopen_boost (file, "rb"); if (!f) { throw FileError (_("could not open file for reading"), file); } @@ -360,7 +372,7 @@ EncodedData::write (shared_ptr film, int frame, Eyes eyes) const { boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true); - FILE* f = fopen (tmp_j2c.string().c_str (), N_("wb")); + FILE* f = fopen_boost (tmp_j2c, "wb"); if (!f) { throw WriteFileError (tmp_j2c, errno); @@ -376,7 +388,7 @@ EncodedData::write (shared_ptr film, int frame, Eyes eyes) const } void -EncodedData::write_info (shared_ptr film, int frame, Eyes eyes, libdcp::FrameInfo fin) const +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");