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 3a85a5ac6acf553eb7adc8dadc66d8530671d216..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>
@@ -71,9 +71,6 @@ 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.
@@ -125,14 +122,14 @@ 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 = {};
        /* This was empirically derived by a user: see #1902 */
        int const minimum_size = 16384;
-       LOG_GENERAL ("Using minimum frame size %1", minimum_size);
+       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;
@@ -148,7 +145,7 @@ DCPVideo::encode_locally ()
                );
 
                if (enc.size() >= minimum_size) {
-                       LOG_GENERAL (N_("Frame %1 encoded size was OK (%2)"), _index, enc.size());
+                       LOG_DEBUG_ENCODE(N_("Frame %1 encoded size was OK (%2)"), _index, enc.size());
                        break;
                }
 
@@ -204,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);
@@ -212,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);
 
@@ -228,7 +226,7 @@ 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(xml.bytes() + 1);
                socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1);
 
                /* Send binary data */