Remove unused define.

[dcpomatic.git] / src / lib / dcp_video.cc

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 18d7985c85c4e5ded2ca7839c6d1a8025f24037b..8eb76fdd63670bebce5b09156f7900e8b8b9e6d2 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -42,15 +42,15 @@
 #include "log.h"
 #include "player_video.h"
 #include "rng.h"
-#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k_transcode.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <stdint.h>
@@ -59,18 +59,17 @@ DCPOMATIC_ENABLE_WARNINGS
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
-using dcp::Size;
 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.
@@ -103,7 +102,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 {
        shared_ptr<dcp::OpenJPEGImage> xyz;
 
-       auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, 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],
@@ -123,16 +122,18 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
  *  @return Encoded data.
  */
 ArrayData
-DCPVideo::encode_locally ()
+DCPVideo::encode_locally () const
 {
        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);
+       /* 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,
@@ -144,10 +145,11 @@ DCPVideo::encode_locally ()
                );
 
                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"), _index, enc.size(), noise_amount);
+               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 <cough>DSS200</cough> so add some noise
                 * and try again.  This is slow but hopefully won't happen too often.  We have to do
@@ -160,13 +162,18 @@ DCPVideo::encode_locally ()
                dcpomatic::RNG rng(42);
                for (auto c = 0; c < 3; ++c) {
                        auto p = xyz->data(c);
-                       for (auto i = 0; i < pixels; ++i) {
+                       auto e = xyz->data(c) + pixels;
+                       while (p < e) {
                                *p = std::min(4095, std::max(0, *p + (rng.get() % noise_amount)));
-                               ++p;
+                               p += pixel_skip;
                        }
                }
 
-               ++noise_amount;
+               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);
        }
@@ -194,7 +201,7 @@ DCPVideo::encode_locally ()
  *  @return Encoded data.
  */
 ArrayData
-DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
+DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const
 {
        boost::asio::io_service io_service;
        boost::asio::ip::tcp::resolver resolver (io_service);
@@ -202,6 +209,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
        boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
        auto socket = make_shared<Socket>(timeout);
+       socket->set_send_buffer_size (512 * 1024);
 
        socket->connect (*endpoint_iterator);
 
@@ -218,8 +226,8 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 
                /* Send XML metadata */
                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(xml.bytes() + 1);
+               socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1);
 
                /* Send binary data */
                LOG_TIMING("start-remote-send thread=%1", thread_id ());