X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=c98273ad20043ed3cd81fc6ef81e3ffa5ac771fb;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=1422b6948426c9db21858a16d5dec27ae6d3b50e;hpb=7f23456dce480a813f1d6ebb22cf6aa0d5214c49;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 1422b6948..c98273ad2 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,60 +18,70 @@ */ + #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" #include "dcpomatic_assert.h" +#include "warnings.h" #include #include #include #include #include #include -#include +#include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include "i18n.h" -using std::string; + using std::cout; +using std::dynamic_pointer_cast; +using std::make_pair; +using std::make_shared; using std::max; using std::pair; -using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; using boost::optional; -using boost::dynamic_pointer_cast; -using dcp::Data; +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, @@ -79,40 +89,36 @@ J2KImageProxy::J2KImageProxy ( AVPixelFormat pixel_format, optional forced_reduction ) - : _size (size) + : _data (eye == dcp::Eye::LEFT ? 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")); + _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 J2KImageProxy::prepare (optional target_size) const { @@ -136,30 +142,36 @@ J2KImageProxy::prepare (optional target_size) const reduce = max (0, reduce); } - shared_ptr decompressed = dcp::decompress_j2k (const_cast (_data.data().get()), _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; + try { + /* XXX: should check that potentially trashing _data here doesn't matter */ + auto decompressed = dcp::decompress_j2k (const_cast(_data->data()), _data->size(), reduce); + _image.reset (new Image (_pixel_format, decompressed->size(), false)); + + 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) { + auto q = reinterpret_cast(_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 = make_shared(_pixel_format, _size, true); + _image->make_black (); + _error = true; } _target_size = target_size; @@ -168,58 +180,66 @@ J2KImageProxy::prepare (optional target_size) const return reduce; } -pair, int> -J2KImageProxy::image (optional, optional target_size) const + +ImageProxy::Result +J2KImageProxy::image (optional target_size) const { - return make_pair (_image, prepare(target_size)); + int const r = prepare (target_size); + + /* I think this is safe without a lock on mutex. _image is guaranteed to be + set up when prepare() has happened. + */ + return Result (_image, r, _error); } + void 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)); + 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 (_eye) { - node->add_child("Eye")->add_child_text (raw_convert (static_cast (_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 ())); + 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 J2KImageProxy::same (shared_ptr other) const { - shared_ptr jp = dynamic_pointer_cast (other); + auto 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; + 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); } + size_t J2KImageProxy::memory_used () const { - size_t m = _data.size(); + size_t m = _data->size(); if (_image) { /* 3 components, 16-bits per pixel */ m += 3 * 2 * _image->size().width * _image->size().height;