X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=064bbec7bbc3632c7f7366a941521356812ae64c;hb=99cb06de7d7dde4c558d69bbce5fe09090bada27;hp=d4c7a8716d7a6dae7876d3b07030b0a0f8a79fde;hpb=25d968fdcf1abada4bd7bbcb8c72eeebda73b134;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index d4c7a8716..064bbec7b 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,7 +31,9 @@ #include #include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include #include "i18n.h" @@ -43,35 +46,38 @@ using std::make_pair; using boost::shared_ptr; 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,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 @@ -136,36 +137,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); - - /* When scaling JPEG2000 images (using AV_PIX_FMT_XYZ12LE) ffmpeg will call xyz12ToRgb48 which reads data - from the whole of the image stride. If we are cropping, Image::crop_scale_window munges the - start addresses of each image row (to do the crop) but keeps the stride the same. This means - that under crop we will read over the end of the image by the amount of the crop. To allow this - to happen without invalid memory access we need to overallocate by one whole stride's worth of pixels. - */ - _image.reset (new Image (_pixel_format, decompressed->size(), true, decompressed->size().width)); - - 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 */ + 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; @@ -174,16 +175,19 @@ J2KImageProxy::prepare (optional target_size) const return reduce; } -pair, int> + +ImageProxy::Result J2KImageProxy::image (optional target_size) const { 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 make_pair (_image, r); + 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,15 +214,11 @@ 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) { @@ -229,7 +229,7 @@ J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_for 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;