X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=303792b80f406e8e8417e401ed646f3410d10f81;hp=59106098a8351a1634f3e2023816856b9137a681;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=bf6eadb7b8dc4073a940cdf9327323366b9e11e2 diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 59106098a..303792b80 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -20,41 +20,54 @@ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "encoded_data.h" +#include "data.h" #include "raw_convert.h" +#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; /** Construct a J2KImageProxy from a JPEG2000 file */ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) - : _mono (new dcp::MonoPictureFrame (path)) + : _data (path) , _size (size) { } J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size) - : _mono (frame) + : _data (frame->j2k_size ()) , _size (size) { - + memcpy (_data.data().get(), frame->j2k_data(), _data.size ()); } J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, dcp::Eye eye) - : _stereo (frame) - , _size (size) + : _size (size) , _eye (eye) { - + 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) @@ -62,18 +75,9 @@ J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr soc _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")); + socket->read (_data.data().get (), _data.size ()); } shared_ptr @@ -81,10 +85,34 @@ J2KImageProxy::image (optional note) const { shared_ptr image (new Image (PIX_FMT_RGB48LE, _size, true)); - if (_mono) { - dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); + shared_ptr oj = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), 0); + + if (oj->opj_image()->comps[0].prec < 12) { + int const shift = 12 - oj->opj_image()->comps[0].prec; + 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) { + *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; + } + } } else { - dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } return image; @@ -96,36 +124,36 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const node->add_child("Type")->add_child_text (N_("J2K")); node->add_child("Width")->add_child_text (raw_convert (_size.width)); node->add_child("Height")->add_child_text (raw_convert (_size.height)); - if (_stereo) { + if (_eye) { node->add_child("Eye")->add_child_text (raw_convert (_eye.get ())); - node->add_child("LeftSize")->add_child_text (raw_convert (_stereo->left_j2k_size ())); - node->add_child("RightSize")->add_child_text (raw_convert (_stereo->right_j2k_size ())); - } else { - node->add_child("Size")->add_child_text (raw_convert (_mono->j2k_size ())); } + 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.get() == 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) + : _data (data) + , _size (size) +{ + }