Move locale_convert into libdcp.

[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 35073201c121a6e6a693e43bb64b183bb5f8d8b2..fb38c9e999a9d04913f14823a67a0ed581429944 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -1,34 +1,34 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
-#include "data.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
+#include <dcp/j2k.h>
 #include <libcxml/cxml.h>
-#include <openjpeg.h>
 #include <libxml++/libxml++.h>
 #include <iostream>
 
@@ -39,25 +39,30 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::Data;
+using dcp::raw_convert;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
-J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
+J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)
        : _data (path)
        , _size (size)
+       , _pixel_format (pixel_format)
 {
 
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size, AVPixelFormat pixel_format)
        : _data (frame->j2k_size ())
        , _size (size)
+       , _pixel_format (pixel_format)
 {
        memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye, AVPixelFormat pixel_format)
        : _size (size)
        , _eye (eye)
+       , _pixel_format (pixel_format)
 {
        switch (eye) {
        case dcp::EYE_LEFT:
@@ -78,6 +83,11 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
                _eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
        }
        _data = Data (xml->number_child<int> ("Size"));
+       /* This only matters when we are using J2KImageProxy for the preview, which
+          will never use this constructor (which is only used for passing data to
+          encode servers).  So we can put anything in here.  It's a bit of a hack.
+       */
+       _pixel_format = AV_PIX_FMT_XYZ12LE;
        socket->read (_data.data().get (), _data.size ());
 }
 
@@ -94,8 +104,8 @@ J2KImageProxy::image (optional<dcp::NoteHandler>) const
 {
        ensure_j2k ();
 
-       if (_j2k->opj_image()->comps[0].prec < 12) {
-               int const shift = 12 - _j2k->opj_image()->comps[0].prec;
+       if (_j2k->precision(0) < 12) {
+               int const shift = 12 - _j2k->precision (0);
                for (int c = 0; c < 3; ++c) {
                        int* p = _j2k->data (c);
                        for (int y = 0; y < _j2k->size().height; ++y) {
@@ -106,7 +116,7 @@ J2KImageProxy::image (optional<dcp::NoteHandler>) const
                }
        }
 
-       shared_ptr<Image> image (new Image (pixel_format(), _size, true));
+       shared_ptr<Image> image (new Image (_pixel_format, _size, true));
 
        /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
           the data is 12-bit either way.
@@ -133,7 +143,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
        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 (_eye) {
-               node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
+               node->add_child("Eye")->add_child_text (raw_convert<string> (static_cast<int> (_eye.get ())));
        }
        node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
 }
@@ -159,21 +169,10 @@ J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
        return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
 }
 
-AVPixelFormat
-J2KImageProxy::pixel_format () const
-{
-       ensure_j2k ();
-
-       if (_j2k->opj_image()->color_space == CLRSPC_SRGB) {
-               return AV_PIX_FMT_RGB48LE;
-       }
-
-       return AV_PIX_FMT_XYZ12LE;
-}
-
-J2KImageProxy::J2KImageProxy (Data data, dcp::Size size)
+J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format)
        : _data (data)
        , _size (size)
+       , _pixel_format (pixel_format)
 {
 
 }