X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=e1666ea756107b74a2a88a6b51dc17ce628049ff;hb=ef578569611e2fa0e91bdd5a726fc0c251540e6d;hp=36928b3fcfb8ac4f22c1cf674fa612d2a755a6a3;hpb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 36928b3fc..e1666ea75 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + /** @file src/dcp_video_frame.cc * @brief A single frame of video destined for a DCP. * @@ -28,17 +29,19 @@ * of images that require encoding. */ -#include "dcp_video.h" + +#include "compose.hpp" #include "config.h" -#include "exceptions.h" -#include "encode_server_description.h" +#include "cross.h" +#include "dcp_video.h" +#include "dcpomatic_log.h" #include "dcpomatic_socket.h" +#include "encode_server_description.h" +#include "exceptions.h" #include "image.h" #include "log.h" -#include "dcpomatic_log.h" -#include "cross.h" #include "player_video.h" -#include "compose.hpp" +#include "rng.h" #include "warnings.h" #include #include @@ -56,11 +59,12 @@ DCPOMATIC_ENABLE_WARNINGS #include "i18n.h" -using std::string; using std::cout; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; +using std::string; using dcp::Size; -using dcp::Data; +using dcp::ArrayData; using dcp::raw_convert; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -91,7 +95,7 @@ DCPVideo::DCPVideo (shared_ptr frame, shared_ptrnumber_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)); + _resolution = Resolution (node->optional_number_child("Resolution").get_value_or(static_cast(Resolution::TWO_K))); } shared_ptr @@ -99,7 +103,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler { shared_ptr xyz; - shared_ptr image = frame->image (bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false); + auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, true, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -109,7 +113,7 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler note ); } else { - xyz.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0])); + xyz = make_shared(image->data()[0], image->size(), image->stride()[0]); } return xyz; @@ -118,28 +122,63 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler /** J2K-encode this frame on the local host. * @return Encoded data. */ -Data +ArrayData DCPVideo::encode_locally () { - string const comment = Config::instance()->dcp_j2k_comment(); - - Data enc = dcp::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, - comment.empty() ? "libdcp" : comment + auto const comment = Config::instance()->dcp_j2k_comment(); + + ArrayData enc = {}; + int const minimum_size = Config::instance()->minimum_frame_size(); + LOG_GENERAL ("Using minimum frame size %1", minimum_size); + + auto xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + int noise_amount = 2; + while (true) { + enc = dcp::compress_j2k ( + xyz, + _j2k_bandwidth, + _frames_per_second, + _frame->eyes() == Eyes::LEFT || _frame->eyes() == Eyes::RIGHT, + _resolution == Resolution::FOUR_K, + comment.empty() ? "libdcp" : comment ); + if (enc.size() >= minimum_size) { + break; + } + + LOG_GENERAL (N_("Frame %1 encoded size was small (%2); adding noise at level %3"), _index, enc.size(), noise_amount); + + /* The JPEG2000 is too low-bitrate for some decoders DSS200 so add some noise + * and try again. This is slow but hopefully won't happen too often. We have to do + * convert_to_xyz() again because compress_j2k() corrupts its xyz parameter. + */ + + xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2)); + auto size = xyz->size (); + auto pixels = size.width * size.height; + dcpomatic::RNG rng(42); + for (auto c = 0; c < 3; ++c) { + auto p = xyz->data(c); + for (auto i = 0; i < pixels; ++i) { + *p = std::min(4095, std::max(0, *p + (rng.get() % noise_amount))); + ++p; + } + } + + ++noise_amount; + /* Something's gone badly wrong if this much noise doesn't help */ + DCPOMATIC_ASSERT (noise_amount < 16); + } + switch (_frame->eyes()) { - case EYES_BOTH: + case Eyes::BOTH: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for mono"), _index); break; - case EYES_LEFT: + case Eyes::LEFT: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for L"), _index); break; - case EYES_RIGHT: + case Eyes::RIGHT: LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for R"), _index); break; default: @@ -154,7 +193,7 @@ DCPVideo::encode_locally () * @param timeout timeout in seconds. * @return Encoded data. */ -Data +ArrayData DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) { boost::asio::io_service io_service; @@ -162,13 +201,13 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) 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)); + auto socket = make_shared(timeout); socket->connect (*endpoint_iterator); /* Collect all XML metadata */ xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("EncodingRequest"); + auto root = doc.create_root_node ("EncodingRequest"); root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); add_metadata (root); @@ -178,7 +217,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) Socket::WriteDigestScope ds (socket); /* Send XML metadata */ - string xml = doc.write_to_string ("UTF-8"); + auto xml = doc.write_to_string ("UTF-8"); socket->write (xml.length() + 1); socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); @@ -192,9 +231,9 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) */ Socket::ReadDigestScope ds (socket); LOG_TIMING("start-remote-encode thread=%1", thread_id ()); - Data e (socket->read_uint32 ()); + ArrayData e (socket->read_uint32 ()); LOG_TIMING("start-remote-receive thread=%1", thread_id ()); - socket->read (e.data().get(), e.size()); + socket->read (e.data(), e.size()); LOG_TIMING("finish-remote-receive thread=%1", thread_id ()); if (!ds.check()) { throw NetworkError ("Checksums do not match");