#include "j2k_image_proxy.h"
#include "dcpomatic_socket.h"
#include "image.h"
-#include "encoded_data.h"
+#include "data.h"
#include "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 <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
#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<const dcp::MonoPictureFrame> 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<const dcp::StereoPictureFrame> 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<cxml::Node> xml, shared_ptr<Socket> socket)
_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
if (xml->optional_number_child<int> ("Eye")) {
_eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
- int const left_size = xml->number_child<int> ("LeftSize");
- int const right_size = xml->number_child<int> ("RightSize");
- shared_ptr<dcp::StereoPictureFrame> 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<int> ("Size");
- shared_ptr<dcp::MonoPictureFrame> f (new dcp::MonoPictureFrame ());
- socket->read (f->j2k_data (), size);
- _mono = f;
}
+ _data = Data (xml->number_child<int> ("Size"));
+ socket->read (_data.data().get (), _data.size ());
}
shared_ptr<Image>
{
shared_ptr<Image> 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<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_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;
node->add_child("Type")->add_child_text (N_("J2K"));
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) {
+ if (_eye) {
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 (raw_convert<string> (_mono->j2k_size ()));
}
+ node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
}
void
J2KImageProxy::send_binary (shared_ptr<Socket> 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<EncodedData>
-J2KImageProxy::j2k () const
+bool
+J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
{
- if (_mono) {
- return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size()));
- } else {
- if (_eye.get() == dcp::EYE_LEFT) {
- return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
- } else {
- return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
- }
+ shared_ptr<const J2KImageProxy> jp = dynamic_pointer_cast<const J2KImageProxy> (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)
+{
+
}
projects / dcpomatic.git / blobdiff