Rename EncodedData -> Data and trim it a bit.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index ccfc800c8389f275518b774d3e8e4daa7c1157dd..af614a10f2d12d6322033211387566466a843fa6 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,25 @@
  *  of images that require encoding.
  */
 
+#include "dcp_video.h"
+#include "config.h"
+#include "exceptions.h"
+#include "server.h"
+#include "dcpomatic_socket.h"
+#include "image.h"
+#include "log.h"
+#include "cross.h"
+#include "player_video.h"
+#include "raw_convert.h"
+#include "data.h"
+#include <libcxml/cxml.h>
+#include <dcp/xyz_image.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/colour_matrix.h>
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
 #include <stdint.h>
 #include <cstring>
 #include <cstdlib>
@@ -38,28 +57,6 @@
 #include <fstream>
 #include <unistd.h>
 #include <errno.h>
-#include <boost/array.hpp>
-#include <boost/asio.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <dcp/gamma_lut.h>
-#include <dcp/xyz_frame.h>
-#include <dcp/rgb_xyz.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <libcxml/cxml.h>
-#include "film.h"
-#include "dcp_video.h"
-#include "config.h"
-#include "exceptions.h"
-#include "server.h"
-#include "util.h"
-#include "scaler.h"
-#include "image.h"
-#include "log.h"
-#include "cross.h"
-#include "player_video.h"
-#include "encoded_data.h"
 
 #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
@@ -70,7 +67,6 @@ using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using dcp::Size;
-using dcp::raw_convert;
 
 #define DCI_COEFFICENT (48.0 / 52.37)
 
@@ -108,29 +104,23 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 /** J2K-encode this frame on the local host.
  *  @return Encoded data.
  */
-shared_ptr<EncodedData>
-DCPVideo::encode_locally ()
+shared_ptr<Data>
+DCPVideo::encode_locally (dcp::NoteHandler note)
 {
-       shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-               12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised
-               );
-       
-       /* XXX: libdcp should probably use boost */
-       
-       double matrix[3][3];
-       for (int i = 0; i < 3; ++i) {
-               for (int j = 0; j < 3; ++j) {
-                       matrix[i][j] = _frame->colour_conversion().matrix (i, j);
-               }
+       shared_ptr<dcp::XYZImage> xyz;
+
+       shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
+       if (_frame->colour_conversion()) {
+               xyz = dcp::rgb_to_xyz (
+                       image->data()[0],
+                       image->size(),
+                       image->stride()[0],
+                       _frame->colour_conversion().get()
+                       );
+       } else {
+               xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);
        }
 
-       shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (
-               _frame->image (_burn_subtitles),
-               in_lut,
-               dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false),
-               matrix
-               );
-
        /* Set the max image and component sizes based on frame_rate */
        int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
        if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) {
@@ -246,7 +236,7 @@ DCPVideo::encode_locally ()
                break;
        }
 
-       shared_ptr<EncodedData> enc (new LocallyEncodedData (cio->buffer, cio_tell (cio)));
+       shared_ptr<Data> enc (new Data (cio->buffer, cio_tell (cio)));
 
        opj_cio_close (cio);
        free (parameters.cp_comment);
@@ -259,7 +249,7 @@ DCPVideo::encode_locally ()
  *  @param serv Server to send to.
  *  @return Encoded data.
  */
-shared_ptr<EncodedData>
+shared_ptr<Data>
 DCPVideo::encode_remotely (ServerDescription serv)
 {
        boost::asio::io_service io_service;
@@ -290,8 +280,8 @@ DCPVideo::encode_remotely (ServerDescription serv)
        /* Read the response (JPEG2000-encoded data); this blocks until the data
           is ready and sent back.
        */
-       shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
-       socket->read (e->data(), e->size());
+       shared_ptr<Data> e (new Data (socket->read_uint32 ()));
+       socket->read (e->data().get(), e->size());
 
        LOG_GENERAL (N_("Finished remotely-encoded frame %1"), _index);