X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=fb38c9e999a9d04913f14823a67a0ed581429944;hb=b81241ce69a689629307832f802ac4faa6ed885f;hp=7dca3d8a9faca7324e49a5bbc32a3c4b2008d6b1;hpb=6e10de6161f783de85bbaf59824a29026d524e55;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 7dca3d8a9..fb38c9e99 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -1,33 +1,36 @@ /* Copyright (C) 2014-2015 Carl Hetherington - 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 . */ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "data.h" -#include "raw_convert.h" +#include #include #include #include #include #include +#include #include +#include +#include #include "i18n.h" @@ -35,25 +38,31 @@ using std::string; 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 frame, dcp::Size size) +J2KImageProxy::J2KImageProxy (shared_ptr 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 frame, dcp::Size size, dcp::Eye eye) +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, dcp::Eye eye, AVPixelFormat pixel_format) : _size (size) , _eye (eye) + , _pixel_format (pixel_format) { switch (eye) { case dcp::EYE_LEFT: @@ -74,44 +83,56 @@ J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr soc _eye = static_cast (xml->number_child ("Eye")); } _data = Data (xml->number_child ("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 ()); } -shared_ptr -J2KImageProxy::image (optional note) const +void +J2KImageProxy::ensure_j2k () const { - shared_ptr image (new Image (PIX_FMT_RGB48LE, _size, true)); + if (!_j2k) { + _j2k = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), 0); + } +} - shared_ptr oj = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), 0); +shared_ptr +J2KImageProxy::image (optional) const +{ + ensure_j2k (); - if (oj->opj_image()->comps[0].prec < 12) { - int const shift = 12 - oj->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 = oj->data (c); - for (int y = 0; y < oj->size().height; ++y) { - for (int x = 0; x < oj->size().width; ++x) { + int* p = _j2k->data (c); + for (int y = 0; y < _j2k->size().height; ++y) { + for (int x = 0; x < _j2k->size().width; ++x) { *p++ <<= shift; } } } } - if (oj->opj_image()->color_space == CLRSPC_SRGB) { - /* No XYZ -> RGB conversion necessary; just copy and interleave the values */ - int p = 0; - for (int y = 0; y < oj->size().height; ++y) { - uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]); - for (int x = 0; x < oj->size().width; ++x) { - for (int c = 0; c < 3; ++c) { - *q++ = oj->data(c)[p] << 4; - } - ++p; + shared_ptr 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. + */ + + int p = 0; + for (int y = 0; y < _j2k->size().height; ++y) { + uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]); + for (int x = 0; x < _j2k->size().width; ++x) { + for (int c = 0; c < 3; ++c) { + *q++ = _j2k->data(c)[p] << 4; } + ++p; } - } else { - dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } - + return image; } @@ -122,7 +143,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const node->add_child("Width")->add_child_text (raw_convert (_size.width)); node->add_child("Height")->add_child_text (raw_convert (_size.height)); if (_eye) { - node->add_child("Eye")->add_child_text (raw_convert (_eye.get ())); + node->add_child("Eye")->add_child_text (raw_convert (static_cast (_eye.get ()))); } node->add_child("Size")->add_child_text (raw_convert (_data.size ())); } @@ -132,3 +153,26 @@ J2KImageProxy::send_binary (shared_ptr socket) const { socket->write (_data.data().get(), _data.size()); } + +bool +J2KImageProxy::same (shared_ptr other) const +{ + shared_ptr jp = dynamic_pointer_cast (other); + if (!jp) { + return false; + } + + if (_data.size() != jp->_data.size()) { + return false; + } + + return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0; +} + +J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format) + : _data (data) + , _size (size) + , _pixel_format (pixel_format) +{ + +}