X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=31fda2510492d9285f8987c73a41acd9551a5435;hp=44b5ebea7f6d67cce56f367e7d917f5173e4fcc1;hb=7b0372776ac4da6a8e4ff29f41a4f08b9b4de506;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05 diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 44b5ebea7..31fda2510 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -21,7 +21,8 @@ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "raw_convert.h" +#include "dcpomatic_assert.h" +#include #include #include #include @@ -36,30 +37,55 @@ 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) { - + /* ::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) { + /* ::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) { + /* ::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 ()); @@ -79,52 +105,76 @@ J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr soc _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 ()); } -void -J2KImageProxy::ensure_j2k () const +int +J2KImageProxy::prepare (optional target_size) const { - if (!_j2k) { - _j2k = dcp::decompress_j2k (const_cast (_data.data().get()), _data.size (), 0); + boost::mutex::scoped_lock lm (_mutex); + + if (_image && target_size == _target_size) { + DCPOMATIC_ASSERT (_reduce); + return *_reduce; } -} -shared_ptr -J2KImageProxy::image (optional) const -{ - ensure_j2k (); - - if (_j2k->precision(0) < 12) { - int const shift = 12 - _j2k->precision (0); - for (int c = 0; c < 3; ++c) { - int* p = _j2k->data (c); - for (int y = 0; y < _j2k->size().height; ++y) { - for (int x = 0; x < _j2k->size().width; ++x) { - *p++ <<= shift; - } - } + 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); } - shared_ptr image (new Image (pixel_format(), _size, true)); + 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 < _j2k->size().height; ++y) { - uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]); - for (int x = 0; x < _j2k->size().width; ++x) { - for (int c = 0; c < 3; ++c) { - *q++ = _j2k->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; } } - return image; + _target_size = target_size; + _reduce = reduce; + + return reduce; +} + +pair, int> +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); } void @@ -134,7 +184,7 @@ 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 ())); } @@ -160,21 +210,22 @@ J2KImageProxy::same (shared_ptr other) const return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0; } -AVPixelFormat -J2KImageProxy::pixel_format () const -{ - ensure_j2k (); - - if (_j2k->srgb ()) { - return AV_PIX_FMT_RGB48LE; - } - - return AV_PIX_FMT_XYZ12LE; -} - -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; }