Change the broadcast string so V2 only recognises V2 servers (and vice versa).

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 806ec94642c0238afcd22428e27840551222b341..7610e6c9f43a5e1dda8643c8ad5f850ec5e1c67b 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -59,6 +59,7 @@
 #include <errno.h>
 
 #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE);
 
 #include "i18n.h"
 
@@ -77,17 +78,16 @@ using dcp::Size;
  *  @param l Log to write to.
  */
 DCPVideo::DCPVideo (
-       shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int bw, Resolution r, bool b, shared_ptr<Log> l
+       shared_ptr<const PlayerVideo> frame, int index, int dcp_fps, int bw, Resolution r, shared_ptr<Log> l
        )
        : _frame (frame)
        , _index (index)
        , _frames_per_second (dcp_fps)
        , _j2k_bandwidth (bw)
        , _resolution (r)
-       , _burn_subtitles (b)
        , _log (l)
 {
-       
+
 }
 
 DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::Node> node, shared_ptr<Log> log)
@@ -98,7 +98,6 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
        _frames_per_second = node->number_child<int> ("FramesPerSecond");
        _j2k_bandwidth = node->number_child<int> ("J2KBandwidth");
        _resolution = Resolution (node->optional_number_child<int>("Resolution").get_value_or (RESOLUTION_2K));
-       _burn_subtitles = node->bool_child ("BurnSubtitles");
 }
 
 /** J2K-encode this frame on the local host.
@@ -109,7 +108,7 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 {
        shared_ptr<dcp::OpenJPEGImage> xyz;
 
-       shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
+       shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, note);
        if (_frame->colour_conversion()) {
                xyz = dcp::rgb_to_xyz (
                        image->data()[0],
@@ -144,11 +143,11 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
        parameters.tile_size_on = false;
        parameters.cp_tdx = 1;
        parameters.cp_tdy = 1;
-       
+
        /* Tile part */
        parameters.tp_flag = 'C';
        parameters.tp_on = 1;
-       
+
        /* Tile and Image shall be at (0,0) */
        parameters.cp_tx0 = 0;
        parameters.cp_ty0 = 0;
@@ -159,19 +158,19 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
        parameters.cblockw_init = 32;
        parameters.cblockh_init = 32;
        parameters.csty |= 0x01;
-       
+
        /* The progression order shall be CPRL */
        parameters.prog_order = CPRL;
-       
+
        /* No ROI */
        parameters.roi_compno = -1;
-       
+
        parameters.subsampling_dx = 1;
        parameters.subsampling_dy = 1;
-       
+
        /* 9-7 transform */
        parameters.irreversible = 1;
-       
+
        parameters.tcp_rates[0] = 0;
        parameters.tcp_numlayers++;
        parameters.cp_disto_alloc = 1;
@@ -179,27 +178,27 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
        if (_resolution == RESOLUTION_4K) {
                parameters.numpocs = 2;
                parameters.POC[0].tile = 1;
-               parameters.POC[0].resno0 = 0; 
+               parameters.POC[0].resno0 = 0;
                parameters.POC[0].compno0 = 0;
                parameters.POC[0].layno1 = 1;
                parameters.POC[0].resno1 = parameters.numresolution - 1;
                parameters.POC[0].compno1 = 3;
                parameters.POC[0].prg1 = CPRL;
                parameters.POC[1].tile = 1;
-               parameters.POC[1].resno0 = parameters.numresolution - 1; 
+               parameters.POC[1].resno0 = parameters.numresolution - 1;
                parameters.POC[1].compno0 = 0;
                parameters.POC[1].layno1 = 1;
                parameters.POC[1].resno1 = parameters.numresolution;
                parameters.POC[1].compno1 = 3;
                parameters.POC[1].prg1 = CPRL;
        }
-       
+
        parameters.cp_comment = strdup (N_("DCP-o-matic"));
        parameters.cp_cinema = _resolution == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_24;
 
        /* 3 components, so use MCT */
        parameters.tcp_mct = 1;
-       
+
        /* set max image */
        parameters.max_comp_size = max_comp_size;
        parameters.tcp_rates[0] = ((float) (3 * xyz->size().width * xyz->size().height * 12)) / (max_cs_len * 8);
@@ -225,13 +224,13 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
 
        switch (_frame->eyes()) {
        case EYES_BOTH:
-               LOG_GENERAL (N_("Finished locally-encoded frame %1 for mono"), _index);
+               LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for mono"), _index);
                break;
        case EYES_LEFT:
-               LOG_GENERAL (N_("Finished locally-encoded frame %1 for L"), _index);
+               LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for L"), _index);
                break;
        case EYES_RIGHT:
-               LOG_GENERAL (N_("Finished locally-encoded frame %1 for R"), _index);
+               LOG_DEBUG_ENCODE (N_("Finished locally-encoded frame %1 for R"), _index);
                break;
        default:
                break;
@@ -268,15 +267,15 @@ DCPVideo::encode_remotely (ServerDescription serv)
        root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION));
        add_metadata (root);
 
-       LOG_GENERAL (N_("Sending frame %1 to remote"), _index);
-       
+       LOG_DEBUG_ENCODE (N_("Sending frame %1 to remote"), _index);
+
        /* Send XML metadata */
        string xml = doc.write_to_string ("UTF-8");
        socket->write (xml.length() + 1);
        socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 
        /* Send binary data */
-       _frame->send_binary (socket, _burn_subtitles);
+       _frame->send_binary (socket);
 
        /* Read the response (JPEG2000-encoded data); this blocks until the data
           is ready and sent back.
@@ -284,8 +283,8 @@ DCPVideo::encode_remotely (ServerDescription serv)
        Data e (socket->read_uint32 ());
        socket->read (e.data().get(), e.size());
 
-       LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index);
-       
+       LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);
+
        return e;
 }
 
@@ -296,8 +295,7 @@ DCPVideo::add_metadata (xmlpp::Element* el) const
        el->add_child("FramesPerSecond")->add_child_text (raw_convert<string> (_frames_per_second));
        el->add_child("J2KBandwidth")->add_child_text (raw_convert<string> (_j2k_bandwidth));
        el->add_child("Resolution")->add_child_text (raw_convert<string> (int (_resolution)));
-       el->add_child("BurnSubtitles")->add_child_text (_burn_subtitles ? "1" : "0");
-       _frame->add_metadata (el, _burn_subtitles);
+       _frame->add_metadata (el);
 }
 
 Eyes
@@ -314,8 +312,7 @@ DCPVideo::same (shared_ptr<const DCPVideo> other) const
 {
        if (_frames_per_second != other->_frames_per_second ||
            _j2k_bandwidth != other->_j2k_bandwidth ||
-           _resolution != other->_resolution ||
-           _burn_subtitles != other->_burn_subtitles) {
+           _resolution != other->_resolution) {
                return false;
        }