X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=a2685bb49251eba41bd03a7f30a9c170dde2145f;hp=6924fad795bd1ddbdcab067036a96917110560ed;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41 diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 6924fad79..a2685bb49 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -1,123 +1,177 @@ /* - Copyright (C) 2014 Carl Hetherington + 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 -#include -#include -#include #include "j2k_image_proxy.h" -#include "util.h" +#include "dcpomatic_socket.h" #include "image.h" -#include "encoded_data.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "i18n.h" using std::string; +using std::cout; using boost::shared_ptr; +using boost::optional; +using boost::dynamic_pointer_cast; +using dcp::Data; -J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, shared_ptr log) - : ImageProxy (log) - , _mono (frame) +/** Construct a J2KImageProxy from a JPEG2000 file */ +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, dcp::Eye eye, shared_ptr log) - : ImageProxy (log) - , _stereo (frame) +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, AVPixelFormat pixel_format) + : _data (frame->j2k_size ()) , _size (size) - , _eye (eye) + , _pixel_format (pixel_format) { + memcpy (_data.data().get(), frame->j2k_data(), _data.size ()); +} +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: + _data = Data (frame->left_j2k_size ()); + memcpy (_data.data().get(), frame->left_j2k_data(), _data.size ()); + break; + case dcp::EYE_RIGHT: + _data = Data (frame->right_j2k_size ()); + memcpy (_data.data().get(), frame->right_j2k_data(), _data.size ()); + break; + } } -J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr socket, shared_ptr log) - : ImageProxy (log) +J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr socket) { _size = dcp::Size (xml->number_child ("Width"), xml->number_child ("Height")); if (xml->optional_number_child ("Eye")) { _eye = static_cast (xml->number_child ("Eye")); - int const left_size = xml->number_child ("LeftSize"); - int const right_size = xml->number_child ("RightSize"); - shared_ptr f (new dcp::StereoPictureFrame ()); - socket->read (f->left_j2k_data(), left_size); - socket->read (f->right_j2k_data(), right_size); - _stereo = f; - } else { - int const size = xml->number_child ("Size"); - shared_ptr f (new dcp::MonoPictureFrame ()); - socket->read (f->j2k_data (), size); - _mono = f; + } + _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 ()); +} + +void +J2KImageProxy::ensure_j2k () const +{ + if (!_j2k) { + _j2k = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), 0); } } shared_ptr -J2KImageProxy::image () const +J2KImageProxy::image (optional) const { - shared_ptr image (new Image (PIX_FMT_RGB24, _size, false)); + ensure_j2k (); + + 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) { + for (int x = 0; x < _j2k->size().width; ++x) { + *p++ <<= shift; + } + } + } + } + + shared_ptr image (new Image (_pixel_format, _size, true)); - if (_mono) { - _mono->rgb_frame (image->data()[0]); - } else { - _stereo->rgb_frame (_eye, image->data()[0]); + /* 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; + } } - return shared_ptr (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 (_size.width)); - node->add_child("Height")->add_child_text (dcp::raw_convert (_size.height)); - if (_stereo) { - node->add_child("Eye")->add_child_text (dcp::raw_convert (_eye)); - node->add_child("LeftSize")->add_child_text (dcp::raw_convert (_stereo->left_j2k_size ())); - node->add_child("RightSize")->add_child_text (dcp::raw_convert (_stereo->right_j2k_size ())); - } else { - node->add_child("Size")->add_child_text (dcp::raw_convert (_mono->j2k_size ())); + 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("Size")->add_child_text (raw_convert (_data.size ())); } void J2KImageProxy::send_binary (shared_ptr socket) const { - if (_mono) { - socket->write (_mono->j2k_data(), _mono->j2k_size ()); - } else { - socket->write (_stereo->left_j2k_data(), _stereo->left_j2k_size ()); - socket->write (_stereo->right_j2k_data(), _stereo->right_j2k_size ()); - } + socket->write (_data.data().get(), _data.size()); } -shared_ptr -J2KImageProxy::j2k () const +bool +J2KImageProxy::same (shared_ptr other) const { - if (_mono) { - return shared_ptr (new EncodedData (_mono->j2k_data(), _mono->j2k_size())); - } else { - if (_eye == dcp::EYE_LEFT) { - return shared_ptr (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size())); - } else { - return shared_ptr (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size())); - } + 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) +{ + }