X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=5879d6be68da23cca44f1ecd85d4d137d45cd118;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=d6b9d4f278fb20a9437cbaecbce9e860dd6f26be;hpb=2bec3708fc744c18128c5bdb4c2a332f5c8eb283;p=dcpomatic.git diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index d6b9d4f27..5879d6be6 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,26 +29,28 @@ * 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 "warnings.h" +#include "rng.h" #include #include #include #include -#include -DCPOMATIC_DISABLE_WARNINGS +#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include #include @@ -56,15 +59,21 @@ DCPOMATIC_ENABLE_WARNINGS #include "i18n.h" -using std::string; + using std::cout; -using boost::shared_ptr; -using dcp::Size; -using dcp::Data; +using std::make_shared; +using std::shared_ptr; +using std::string; +using dcp::ArrayData; using dcp::raw_convert; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + #define DCI_COEFFICENT (48.0 / 52.37) + /** Construct a DCP video frame. * @param frame Input frame. * @param index Index of the frame within the DCP. @@ -88,7 +97,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 @@ -96,7 +105,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, false); if (frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( image->data()[0], @@ -106,7 +115,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; @@ -115,28 +124,71 @@ DCPVideo::convert_to_xyz (shared_ptr frame, dcp::NoteHandler /** J2K-encode this frame on the local host. * @return Encoded data. */ -Data -DCPVideo::encode_locally () +ArrayData +DCPVideo::encode_locally () const { - string const comment = Config::instance()->dcp_j2k_comment(); - - Data enc = 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 = {}; + /* This was empirically derived by a user: see #1902 */ + int const minimum_size = 16384; + LOG_DEBUG_ENCODE("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; + int pixel_skip = 16; + 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) { + LOG_DEBUG_ENCODE(N_("Frame %1 encoded size was OK (%2)"), _index, enc.size()); + break; + } + + LOG_GENERAL (N_("Frame %1 encoded size was small (%2); adding noise at level %3 with pixel skip %4"), _index, enc.size(), noise_amount, pixel_skip); + + /* 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); + auto e = xyz->data(c) + pixels; + while (p < e) { + *p = std::min(4095, std::max(0, *p + (rng.get() % noise_amount))); + p += pixel_skip; + } + } + + if (pixel_skip > 1) { + --pixel_skip; + } else { + ++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: @@ -151,21 +203,22 @@ DCPVideo::encode_locally () * @param timeout timeout in seconds. * @return Encoded data. */ -Data -DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) +ArrayData +DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const { 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 (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->set_send_buffer_size (512 * 1024); 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); @@ -175,9 +228,9 @@ 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); + socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1); /* Send binary data */ LOG_TIMING("start-remote-send thread=%1", thread_id ()); @@ -189,9 +242,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");