/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#include "j2k_image_proxy.h"
#include "dcpomatic_socket.h"
#include "image.h"
-#include "raw_convert.h"
+#include "dcpomatic_assert.h"
+#include "warnings.h"
+#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/mono_picture_frame.h>
#include <dcp/stereo_picture_frame.h>
#include <dcp/rgb_xyz.h>
#include <dcp/j2k.h>
#include <libcxml/cxml.h>
-#include <openjpeg.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
#include "i18n.h"
using std::string;
using std::cout;
-using boost::shared_ptr;
+using std::max;
+using std::pair;
+using std::make_pair;
+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)
- : _data (path)
+J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)
+ : _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<const dcp::MonoPictureFrame> frame, dcp::Size size)
- : _data (frame->j2k_size ())
+
+J2KImageProxy::J2KImageProxy (
+ shared_ptr<const dcp::MonoPictureFrame> frame,
+ dcp::Size size,
+ AVPixelFormat pixel_format,
+ optional<int> forced_reduction
+ )
+ : _data (frame)
, _size (size)
+ , _pixel_format (pixel_format)
+ , _forced_reduction (forced_reduction)
+ , _error (false)
{
- memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
}
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye)
- : _size (size)
+
+J2KImageProxy::J2KImageProxy (
+ shared_ptr<const dcp::StereoPictureFrame> frame,
+ dcp::Size size,
+ dcp::Eye eye,
+ AVPixelFormat pixel_format,
+ optional<int> forced_reduction
+ )
+ : _data (eye ? frame->left() : frame->right())
+ , _size (size)
, _eye (eye)
+ , _pixel_format (pixel_format)
+ , _forced_reduction (forced_reduction)
+ , _error (false)
{
- 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;
- }
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
}
+
J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+ : _error (false)
{
_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
if (xml->optional_number_child<int> ("Eye")) {
_eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
}
- _data = Data (xml->number_child<int> ("Size"));
- socket->read (_data.data().get (), _data.size ());
+ shared_ptr<ArrayData> data(new ArrayData(xml->number_child<int>("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(), data->size());
+ _data = data;
}
-void
-J2KImageProxy::ensure_j2k () const
+int
+J2KImageProxy::prepare (optional<dcp::Size> target_size) const
{
- if (!_j2k) {
- _j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
- }
-}
+ boost::mutex::scoped_lock lm (_mutex);
-shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>) const
-{
- ensure_j2k ();
-
- if (_j2k->opj_image()->comps[0].prec < 12) {
- int const shift = 12 - _j2k->opj_image()->comps[0].prec;
- 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;
- }
- }
- }
+ if (_image && target_size == _target_size) {
+ DCPOMATIC_ASSERT (_reduce);
+ return *_reduce;
}
- shared_ptr<Image> image (new Image (pixel_format(), _size, true));
+ int reduce = 0;
- /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
- the data is 12-bit either way.
- */
+ 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);
+ }
- 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;
+ try {
+ /* XXX: should check that potentially trashing _data here doesn't matter */
+ shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*>(_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;
}
- ++p;
}
+ } 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<dcp::Size> 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
{
node->add_child("Width")->add_child_text (raw_convert<string> (_size.width));
node->add_child("Height")->add_child_text (raw_convert<string> (_size.height));
if (_eye) {
- node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
+ node->add_child("Eye")->add_child_text (raw_convert<string> (static_cast<int> (_eye.get ())));
}
- node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
+ node->add_child("Size")->add_child_text (raw_convert<string>(_data->size()));
}
void
-J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
+J2KImageProxy::write_to_socket (shared_ptr<Socket> socket) const
{
- socket->write (_data.data().get(), _data.size());
+ socket->write (_data->data(), _data->size());
}
bool
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;
}
-AVPixelFormat
-J2KImageProxy::pixel_format () const
+J2KImageProxy::J2KImageProxy (ArrayData data, dcp::Size size, AVPixelFormat pixel_format)
+ : _data (new ArrayData(data))
+ , _size (size)
+ , _pixel_format (pixel_format)
+ , _error (false)
{
- ensure_j2k ();
-
- if (_j2k->opj_image()->color_space == CLRSPC_SRGB) {
- return AV_PIX_FMT_RGB48LE;
- }
-
- return AV_PIX_FMT_XYZ12LE;
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
}
-J2KImageProxy::J2KImageProxy (Data data, dcp::Size size)
- : _data (data)
- , _size (size)
+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;
}
projects / dcpomatic.git / blobdiff