X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=13305b7f36a617dc421be1113174d755ae3180ce;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=a46cda13c4fc841e55f0da7a6b4ca835e4455c46;hpb=62d7752eacb997e830c794e046a42faa1b2e438f;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index a46cda13c..13305b7f3 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -22,6 +22,7 @@ #include "dcpomatic_socket.h" #include "image.h" #include "dcpomatic_assert.h" +#include "warnings.h" #include #include #include @@ -30,8 +31,9 @@ #include #include #include +DCPOMATIC_DISABLE_WARNINGS #include -#include +DCPOMATIC_ENABLE_WARNINGS #include #include "i18n.h" @@ -41,38 +43,41 @@ using std::cout; using std::max; using std::pair; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; -using dcp::Data; +using std::dynamic_pointer_cast; +using dcp::ArrayData; using dcp::raw_convert; /** Construct a J2KImageProxy from a JPEG2000 file */ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format) - : _data (path) + : _data (new dcp::ArrayData(path)) , _size (size) , _pixel_format (pixel_format) + , _error (false) { /* ::image assumes 16bpp */ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE); } + J2KImageProxy::J2KImageProxy ( shared_ptr frame, dcp::Size size, AVPixelFormat pixel_format, optional forced_reduction ) - : _data (frame->j2k_size ()) + : _data (frame) , _size (size) , _pixel_format (pixel_format) , _forced_reduction (forced_reduction) + , _error (false) { /* ::image assumes 16bpp */ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE); - memcpy (_data.data().get(), frame->j2k_data(), _data.size ()); } + J2KImageProxy::J2KImageProxy ( shared_ptr frame, dcp::Size size, @@ -80,38 +85,33 @@ J2KImageProxy::J2KImageProxy ( AVPixelFormat pixel_format, optional forced_reduction ) - : _size (size) + : _data (eye ? frame->left() : frame->right()) + , _size (size) , _eye (eye) , _pixel_format (pixel_format) , _forced_reduction (forced_reduction) + , _error (false) { /* ::image assumes 16bpp */ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE); - 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) + : _error (false) { _size = dcp::Size (xml->number_child ("Width"), xml->number_child ("Height")); if (xml->optional_number_child ("Eye")) { _eye = static_cast (xml->number_child ("Eye")); } - _data = Data (xml->number_child ("Size")); + shared_ptr data(new ArrayData(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 ()); + socket->read (data->data(), data->size()); + _data = data; } int @@ -119,7 +119,7 @@ J2KImageProxy::prepare (optional target_size) const { boost::mutex::scoped_lock lm (_mutex); - if (_decompressed && target_size == _target_size) { + if (_image && target_size == _target_size) { DCPOMATIC_ASSERT (_reduce); return *_reduce; } @@ -137,18 +137,36 @@ J2KImageProxy::prepare (optional target_size) const reduce = max (0, reduce); } - _decompressed = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), reduce); - - if (_decompressed->precision(0) < 12) { - int const shift = 12 - _decompressed->precision (0); - for (int c = 0; c < 3; ++c) { - int* p = _decompressed->data (c); - for (int y = 0; y < _decompressed->size().height; ++y) { - for (int x = 0; x < _decompressed->size().width; ++x) { - *p++ <<= shift; - } + try { + /* XXX: should check that potentially trashing _data here doesn't matter */ + shared_ptr decompressed = dcp::decompress_j2k (const_cast(_data->data()), _data->size(), reduce); + _image.reset (new Image (_pixel_format, decompressed->size(), true)); + + int const shift = 16 - decompressed->precision (0); + + /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming + the data is 12-bit either way. + */ + + int const width = decompressed->size().width; + + int p = 0; + int* decomp_0 = decompressed->data (0); + int* decomp_1 = decompressed->data (1); + int* decomp_2 = decompressed->data (2); + for (int y = 0; y < decompressed->size().height; ++y) { + uint16_t* q = (uint16_t *) (_image->data()[0] + y * _image->stride()[0]); + for (int x = 0; x < width; ++x) { + *q++ = decomp_0[p] << shift; + *q++ = decomp_1[p] << shift; + *q++ = decomp_2[p] << shift; + ++p; } } + } catch (dcp::J2KDecompressionError& e) { + _image.reset (new Image (_pixel_format, _size, true)); + _image->make_black (); + _error = true; } _target_size = target_size; @@ -157,33 +175,19 @@ J2KImageProxy::prepare (optional target_size) const return reduce; } -pair, int> -J2KImageProxy::image (optional, optional target_size) const -{ - int const reduce = prepare (target_size); - shared_ptr image (new Image (_pixel_format, _decompressed->size(), true)); +ImageProxy::Result +J2KImageProxy::image (optional target_size) const +{ + int const r = prepare (target_size); - /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming - the data is 12-bit either way. + /* I think this is safe without a lock on mutex. _image is guaranteed to be + set up when prepare() has happened. */ - - int const width = _decompressed->size().width; - - int p = 0; - for (int y = 0; y < _decompressed->size().height; ++y) { - uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]); - for (int x = 0; x < width; ++x) { - for (int c = 0; c < 3; ++c) { - *q++ = _decompressed->data(c)[p] << 4; - } - ++p; - } - } - - return make_pair (image, reduce); + return Result (_image, r, _error); } + void J2KImageProxy::add_metadata (xmlpp::Node* node) const { @@ -193,13 +197,13 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const if (_eye) { node->add_child("Eye")->add_child_text (raw_convert (static_cast (_eye.get ()))); } - node->add_child("Size")->add_child_text (raw_convert (_data.size ())); + node->add_child("Size")->add_child_text (raw_convert(_data->size())); } void -J2KImageProxy::send_binary (shared_ptr socket) const +J2KImageProxy::write_to_socket (shared_ptr socket) const { - socket->write (_data.data().get(), _data.size()); + socket->write (_data->data(), _data->size()); } bool @@ -210,17 +214,14 @@ J2KImageProxy::same (shared_ptr other) const return false; } - if (_data.size() != jp->_data.size()) { - return false; - } - - return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0; + return *_data == *jp->_data; } -J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format) - : _data (data) +J2KImageProxy::J2KImageProxy (ArrayData data, dcp::Size size, AVPixelFormat pixel_format) + : _data (new ArrayData(data)) , _size (size) , _pixel_format (pixel_format) + , _error (false) { /* ::image assumes 16bpp */ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE); @@ -229,10 +230,10 @@ J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_for size_t J2KImageProxy::memory_used () const { - size_t m = _data.size(); - if (_decompressed) { + size_t m = _data->size(); + if (_image) { /* 3 components, 16-bits per pixel */ - m += 3 * 2 * _decompressed->size().width * _decompressed->size().height; + m += 3 * 2 * _image->size().width * _image->size().height; } return m; }