Remove configuration option for minimum frame size.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 153f4997ed7dbdbaf14afe693a76ae0476fa7c1a..4a505a7e18e65996b4666d59f541e67b0f993c06 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -128,7 +128,8 @@ DCPVideo::encode_locally ()
        auto const comment = Config::instance()->dcp_j2k_comment();
 
        ArrayData enc = {};
-       int const minimum_size = Config::instance()->minimum_frame_size();
+       /* This was empirically derived by a user: see #1902 */
+       int const minimum_size = 16384;
        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));
@@ -226,7 +227,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 ((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 ());