X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fopenjpeg_image.cc;h=c963d2bb9a1cb7308c09872bddd2b56d4c0004f9;hb=refs%2Fheads%2Ftidy-eq-options;hp=4d5b12e2864edd3cf75df2db132412fe4fc20070;hpb=2ae92dcc97765deb2845dd07a338858aeb375cb3;p=libdcp.git diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc index 4d5b12e2..c963d2bb 100644 --- a/src/openjpeg_image.cc +++ b/src/openjpeg_image.cc @@ -1,43 +1,107 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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, + libdcp 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 libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ + /** @file src/openjpeg_image.cc - * @brief OpenJPEGImage class. + * @brief OpenJPEGImage class */ + #include "openjpeg_image.h" #include "dcp_assert.h" +#include #include + using namespace dcp; -/** Construct an OpenJPEGImage, taking ownership of the opj_image_t */ + OpenJPEGImage::OpenJPEGImage (opj_image_t* image) : _opj_image (image) { DCP_ASSERT (_opj_image->numcomps == 3); } -/** Construct a new OpenJPEGImage with undefined contents. - * @param size Size for the frame in pixels. - */ + +OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other) +{ + _opj_image = reinterpret_cast(malloc(sizeof(opj_image_t))); + DCP_ASSERT (_opj_image); + memcpy (_opj_image, other._opj_image, sizeof (opj_image_t)); + + int const data_size = _opj_image->x1 * _opj_image->y1 * 4; + + _opj_image->comps = reinterpret_cast (malloc (_opj_image->numcomps * sizeof (opj_image_comp_t))); + DCP_ASSERT (_opj_image->comps); + memcpy (_opj_image->comps, other._opj_image->comps, _opj_image->numcomps * sizeof (opj_image_comp_t)); + for (unsigned int i = 0; i < _opj_image->numcomps; ++i) { + _opj_image->comps[i].data = reinterpret_cast (malloc (data_size)); + DCP_ASSERT (_opj_image->comps[i].data); + memcpy (_opj_image->comps[i].data, other._opj_image->comps[i].data, data_size); + } + + _opj_image->icc_profile_buf = reinterpret_cast (malloc (_opj_image->icc_profile_len)); + DCP_ASSERT (_opj_image->icc_profile_buf); + memcpy (_opj_image->icc_profile_buf, other._opj_image->icc_profile_buf, _opj_image->icc_profile_len); +} + + OpenJPEGImage::OpenJPEGImage (Size size) +{ + create (size); +} + + +OpenJPEGImage::OpenJPEGImage (uint8_t const * data_16, dcp::Size size, int stride) +{ + create (size); + + int jn = 0; + for (int y = 0; y < size.height; ++y) { + uint16_t const * p = reinterpret_cast (data_16 + y * stride); + for (int x = 0; x < size.width; ++x) { + /* Truncate 16-bit to 12-bit */ + _opj_image->comps[0].data[jn] = *p++ >> 4; + _opj_image->comps[1].data[jn] = *p++ >> 4; + _opj_image->comps[2].data[jn] = *p++ >> 4; + ++jn; + } + } +} + + +void +OpenJPEGImage::create (Size size) { opj_image_cmptparm_t cmptparm[3]; @@ -54,8 +118,8 @@ OpenJPEGImage::OpenJPEGImage (Size size) } /* XXX: is this _SRGB right? */ - _opj_image = opj_image_create (3, &cmptparm[0], CLRSPC_SRGB); - if (_opj_image == 0) { + _opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB); + if (_opj_image == nullptr) { throw std::runtime_error ("could not create libopenjpeg image"); } @@ -65,15 +129,13 @@ OpenJPEGImage::OpenJPEGImage (Size size) _opj_image->y1 = size.height; } -/** OpenJPEGImage destructor */ + OpenJPEGImage::~OpenJPEGImage () { opj_image_destroy (_opj_image); } -/** @param c Component index (0, 1 or 2) - * @return Pointer to the data for component c. - */ + int * OpenJPEGImage::data (int c) const { @@ -81,10 +143,31 @@ OpenJPEGImage::data (int c) const return _opj_image->comps[c].data; } -/** @return Size of the image in pixels */ + dcp::Size OpenJPEGImage::size () const { /* XXX: this may not be right; x0 and y0 can presumably be non-zero */ return dcp::Size (_opj_image->x1, _opj_image->y1); } + + +int +OpenJPEGImage::precision (int component) const +{ + return _opj_image->comps[component].prec; +} + + +int +OpenJPEGImage::factor (int component) const +{ + return _opj_image->comps[component].factor; +} + + +bool +OpenJPEGImage::srgb () const +{ + return _opj_image->color_space == OPJ_CLRSPC_SRGB; +}