Fix crashes on x-thread signal emission.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 62340a4683eda8dbdeede0d3facbd6aedb6942c6..f2d765f7d68ef61e3a53c0d09f4fa539e0e980b1 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,24 +28,21 @@
  *  of images that require encoding.
  */
 
-#include "film.h"
 #include "dcp_video.h"
 #include "config.h"
 #include "exceptions.h"
 #include "server.h"
-#include "util.h"
-#include "scaler.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
 #include "log.h"
 #include "cross.h"
 #include "player_video.h"
+#include "raw_convert.h"
 #include "encoded_data.h"
 #include <libcxml/cxml.h>
-#include <dcp/gamma_lut.h>
-#include <dcp/xyz_frame.h>
+#include <dcp/xyz_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
@@ -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)
 
@@ -109,33 +105,20 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
  *  @return Encoded data.
  */
 shared_ptr<EncodedData>
-DCPVideo::encode_locally ()
+DCPVideo::encode_locally (dcp::NoteHandler note)
 {
-       shared_ptr<dcp::XYZFrame> xyz;
+       shared_ptr<dcp::XYZImage> xyz;
 
+       shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
        if (_frame->colour_conversion()) {
-               ColourConversion conversion = _frame->colour_conversion().get ();
-               shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-                       12, conversion.input_gamma, conversion.input_gamma_linearised
-                       );
-               
-               /* XXX: dcp 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] = conversion.matrix (i, j);
-                       }
-               }
-               
                xyz = dcp::rgb_to_xyz (
-                       _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
-                       in_lut,
-                       dcp::GammaLUT::cache.get (16, 1 / conversion.output_gamma, false),
-                       matrix
+                       image->data()[0],
+                       image->size(),
+                       image->stride()[0],
+                       _frame->colour_conversion().get()
                        );
        } else {
-               xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles));
+               xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]);
        }
 
        /* Set the max image and component sizes based on frame_rate */