Rename EncodedData -> Data and trim it a bit.

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

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 20bf70cf17eb92eb710905a2aad5250d8502d052..3fc6ce9b252e50cd7c951069bc04dbe967fca7db 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,19 +17,22 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_frame.h>
 #include "j2k_image_proxy.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
-#include "encoded_data.h"
+#include "data.h"
+#include "raw_convert.h"
+#include <dcp/mono_picture_frame.h>
+#include <dcp/stereo_picture_frame.h>
+#include <dcp/colour_conversion.h>
+#include <dcp/rgb_xyz.h>
+#include <libcxml/cxml.h>
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
@@ -74,31 +77,31 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 shared_ptr<Image>
-J2KImageProxy::image () const
+J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, false));
+       shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
 
        if (_mono) {
-               _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0]));
+               dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
        } else {
-               _stereo->rgb_frame (_eye, reinterpret_cast<uint16_t*> (image->data()[0]));
+               dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
        }
 
-       return shared_ptr<Image> (new Image (image, true));
+       return image;
 }
 
 void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text (N_("J2K"));
-       node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_size.width));
-       node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_size.height));
+       node->add_child("Width")->add_child_text (raw_convert<string> (_size.width));
+       node->add_child("Height")->add_child_text (raw_convert<string> (_size.height));
        if (_stereo) {
-               node->add_child("Eye")->add_child_text (dcp::raw_convert<string> (_eye));
-               node->add_child("LeftSize")->add_child_text (dcp::raw_convert<string> (_stereo->left_j2k_size ()));
-               node->add_child("RightSize")->add_child_text (dcp::raw_convert<string> (_stereo->right_j2k_size ()));
+               node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
+               node->add_child("LeftSize")->add_child_text (raw_convert<string> (_stereo->left_j2k_size ()));
+               node->add_child("RightSize")->add_child_text (raw_convert<string> (_stereo->right_j2k_size ()));
        } else {
-               node->add_child("Size")->add_child_text (dcp::raw_convert<string> (_mono->j2k_size ()));
+               node->add_child("Size")->add_child_text (raw_convert<string> (_mono->j2k_size ()));
        }
 }
 
@@ -113,16 +116,16 @@ J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
        }
 }
 
-shared_ptr<EncodedData>
+shared_ptr<Data>
 J2KImageProxy::j2k () const
 {
        if (_mono) {
-               return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size()));
+               return shared_ptr<Data> (new Data (_mono->j2k_data(), _mono->j2k_size()));
        } else {
-               if (_eye == dcp::EYE_LEFT) {
-                       return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
+               if (_eye.get() == dcp::EYE_LEFT) {
+                       return shared_ptr<Data> (new Data (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
                } else {
-                       return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
+                       return shared_ptr<Data> (new Data (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
                }
        }
 }