No-op: remove all trailing whitespace.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 78cbe65bddbf3945f9c12cb6633a33a31dc36389..b72353d9ecbc6482c6573f496275e53687d495d4 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -40,7 +40,7 @@
 #include "raw_convert.h"
 #include "data.h"
 #include <libcxml/cxml.h>
-#include <dcp/xyz_image.h>
+#include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
 #include <boost/array.hpp>
@@ -87,7 +87,7 @@ DCPVideo::DCPVideo (
        , _burn_subtitles (b)
        , _log (l)
 {
-       
+
 }
 
 DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::Node> node, shared_ptr<Log> log)
@@ -107,7 +107,7 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 Data
 DCPVideo::encode_locally (dcp::NoteHandler note)
 {
-       shared_ptr<dcp::XYZImage> xyz;
+       shared_ptr<dcp::OpenJPEGImage> xyz;
 
        shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
        if (_frame->colour_conversion()) {
@@ -115,7 +115,8 @@ DCPVideo::encode_locally (dcp::NoteHandler note)
                        image->data()[0],
                        image->size(),
                        image->stride()[0],
-                       _frame->colour_conversion().get()
+                       _frame->colour_conversion().get(),
+                       note
                        );
        } else {
                xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);
@@ -143,11 +144,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;
@@ -158,19 +159,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;
@@ -178,27 +179,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);
@@ -268,7 +269,7 @@ DCPVideo::encode_remotely (ServerDescription serv)
        add_metadata (root);
 
        LOG_GENERAL (N_("Sending frame %1 to remote"), _index);
-       
+
        /* Send XML metadata */
        string xml = doc.write_to_string ("UTF-8");
        socket->write (xml.length() + 1);
@@ -284,7 +285,7 @@ DCPVideo::encode_remotely (ServerDescription serv)
        socket->read (e.data().get(), e.size());
 
        LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index);
-       
+
        return e;
 }