X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=acf8bb05235e7018216824bfd484f0fa533b5d6a;hb=f5980767b7d1d9b39186dd13f12b9d8297a87aef;hp=303792b80f406e8e8417e401ed646f3410d10f81;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 303792b80..acf8bb052 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -1,32 +1,34 @@ /* Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "data.h" -#include "raw_convert.h" +#include "dcpomatic_assert.h" +#include #include #include #include #include #include +#include #include #include #include @@ -35,29 +37,58 @@ using std::string; using std::cout; +using std::max; +using std::pair; +using std::make_pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::Data; +using dcp::raw_convert; /** Construct a J2KImageProxy from a JPEG2000 file */ -J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) +J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format) : _data (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) +J2KImageProxy::J2KImageProxy ( + shared_ptr frame, + dcp::Size size, + AVPixelFormat pixel_format, + optional forced_reduction + ) : _data (frame->j2k_size ()) , _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, dcp::Eye eye) +J2KImageProxy::J2KImageProxy ( + shared_ptr frame, + dcp::Size size, + dcp::Eye eye, + AVPixelFormat pixel_format, + optional forced_reduction + ) : _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 ()); @@ -71,53 +102,94 @@ J2KImageProxy::J2KImageProxy (shared_ptr frame, d } 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")); + /* 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 ()); } -shared_ptr -J2KImageProxy::image (optional note) const +int +J2KImageProxy::prepare (optional target_size) const { - shared_ptr image (new Image (PIX_FMT_RGB48LE, _size, true)); - - 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; - } - } + boost::mutex::scoped_lock lm (_mutex); + + if (_image && target_size == _target_size) { + DCPOMATIC_ASSERT (_reduce); + return *_reduce; + } + + int reduce = 0; + + if (_forced_reduction) { + reduce = *_forced_reduction; + } else { + while (target_size && (_size.width / pow(2, reduce)) > target_size->width && (_size.height / pow(2, reduce)) > target_size->height) { + ++reduce; } + + --reduce; + reduce = max (0, reduce); } - if (oj->opj_image()->color_space == CLRSPC_SRGB) { - /* No XYZ -> RGB conversion necessary; just copy and interleave the values */ + try { + 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; - 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; - } + 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; } } - } else { - dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); + } catch (dcp::J2KDecompressionError& e) { + _image.reset (new Image (_pixel_format, _size, true)); + _image->make_black (); + _error = true; } - return image; + _target_size = target_size; + _reduce = reduce; + + return reduce; +} + + +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 Result (_image, r, _error); } + void J2KImageProxy::add_metadata (xmlpp::Node* node) const { @@ -125,13 +197,13 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const 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 (_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 ())); } void -J2KImageProxy::send_binary (shared_ptr socket) const +J2KImageProxy::write_to_socket (shared_ptr socket) const { socket->write (_data.data().get(), _data.size()); } @@ -151,9 +223,22 @@ J2KImageProxy::same (shared_ptr other) const return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0; } -J2KImageProxy::J2KImageProxy (Data data, dcp::Size size) +J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format) : _data (data) , _size (size) + , _pixel_format (pixel_format) { + /* ::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(); + if (_image) { + /* 3 components, 16-bits per pixel */ + m += 3 * 2 * _image->size().width * _image->size().height; + } + return m; }