X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.cc;h=2eccb77a8aec0531af35c69688e3063097e4762e;hb=fe83eb5293fa4027856f6ee9faec7bfc8288badf;hp=f44b1a304ee438d5e1bcd452b8b78878ea3138fc;hpb=0d7fe66361a40702cb97357955cf35256f1d2c26;p=libdcp.git diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index f44b1a30..2eccb77a 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -1,26 +1,38 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 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. */ #include "rgb_xyz.h" -#include "argb_image.h" -#include "xyz_image.h" -#include "image.h" +#include "openjpeg_image.h" #include "colour_matrix.h" #include "colour_conversion.h" #include "transfer_function.h" @@ -30,49 +42,68 @@ using std::min; using std::max; +using std::cout; using boost::shared_ptr; using boost::optional; using namespace dcp; #define DCI_COEFFICIENT (48.0 / 52.37) -/** Convert an openjpeg XYZ image to RGBA. +/** Convert an XYZ image to RGBA. * @param xyz_image Image in XYZ. - * @return RGB image. + * @param conversion Colour conversion to use. + * @param argb Buffer to fill with RGBA data. The format of the data is: + * + * 
+ *  Byte   /- 0 -------|- 1 --------|- 2 --------|- 3 --------|- 4 --------|- 5 --------| ...
+ *         |(0, 0) Blue|(0, 0)Green |(0, 0) Red  |(0, 0) Alpha|(0, 1) Blue |(0, 1) Green| ...
+ *
+ * + * So that the first byte is the blue component of the pixel at x=0, y=0, the second + * is the green component, and so on. + * + * Lines are packed so that the second row directly follows the first. */ -shared_ptr +void dcp::xyz_to_rgba ( - boost::shared_ptr xyz_image, - ColourConversion const & conversion + boost::shared_ptr xyz_image, + ColourConversion const & conversion, + uint8_t* argb ) { - int const max_colour = pow (2, 12) - 1; + int const max_colour = pow (2, 16) - 1; struct { double x, y, z; } s; - + struct { double r, g, b; } d; - + int* xyz_x = xyz_image->data (0); int* xyz_y = xyz_image->data (1); int* xyz_z = xyz_image->data (2); - shared_ptr argb_image (new ARGBImage (xyz_image->size ())); - uint8_t* argb = argb_image->data (); - - double const * lut_in = conversion.in()->lut (16); - double const * lut_out = conversion.out()->lut (12); - boost::numeric::ublas::matrix matrix = conversion.matrix (); + double const * lut_in = conversion.out()->lut (12, false); + double const * lut_out = conversion.in()->lut (16, true); + boost::numeric::ublas::matrix const matrix = conversion.xyz_to_rgb (); + + double fast_matrix[9] = { + matrix (0, 0), matrix (0, 1), matrix (0, 2), + matrix (1, 0), matrix (1, 1), matrix (1, 2), + matrix (2, 0), matrix (2, 1), matrix (2, 2) + }; + + int const height = xyz_image->size().height; + int const width = xyz_image->size().width; - for (int y = 0; y < xyz_image->size().height; ++y) { + for (int y = 0; y < height; ++y) { uint8_t* argb_line = argb; - for (int x = 0; x < xyz_image->size().width; ++x) { + for (int x = 0; x < width; ++x) { DCP_ASSERT (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_y < 4096 && *xyz_z < 4096); - + /* In gamma LUT */ s.x = lut_in[*xyz_x++]; s.y = lut_in[*xyz_y++]; @@ -84,52 +115,53 @@ dcp::xyz_to_rgba ( s.z /= DCI_COEFFICIENT; /* XYZ to RGB */ - d.r = ((s.x * matrix(0, 0)) + (s.y * matrix(0, 1)) + (s.z * matrix(0, 2))); - d.g = ((s.x * matrix(1, 0)) + (s.y * matrix(1, 1)) + (s.z * matrix(1, 2))); - d.b = ((s.x * matrix(2, 0)) + (s.y * matrix(2, 1)) + (s.z * matrix(2, 2))); - + d.r = ((s.x * fast_matrix[0]) + (s.y * fast_matrix[1]) + (s.z * fast_matrix[2])); + d.g = ((s.x * fast_matrix[3]) + (s.y * fast_matrix[4]) + (s.z * fast_matrix[5])); + d.b = ((s.x * fast_matrix[6]) + (s.y * fast_matrix[7]) + (s.z * fast_matrix[8])); + d.r = min (d.r, 1.0); d.r = max (d.r, 0.0); - + d.g = min (d.g, 1.0); d.g = max (d.g, 0.0); - + d.b = min (d.b, 1.0); d.b = max (d.b, 0.0); - + /* Out gamma LUT */ - *argb_line++ = lut_out[int(rint(d.b * max_colour))] * 0xff; - *argb_line++ = lut_out[int(rint(d.g * max_colour))] * 0xff; - *argb_line++ = lut_out[int(rint(d.r * max_colour))] * 0xff; + *argb_line++ = lut_out[lrint(d.b * max_colour)] * 0xff; + *argb_line++ = lut_out[lrint(d.g * max_colour)] * 0xff; + *argb_line++ = lut_out[lrint(d.r * max_colour)] * 0xff; *argb_line++ = 0xff; } - - argb += argb_image->stride (); - } - return argb_image; + /* 4 bytes per pixel */ + argb += width * 4; + } } -/** Convert an openjpeg XYZ image to RGB. +/** Convert an XYZ image to 48bpp RGB. * @param xyz_image Frame in XYZ. * @param conversion Colour conversion to use. - * @param rgb Image to write RGB data to; must have space to be - * filled with packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, - * with the 2-byte value for each R/G/B component stored as - * little-endian; i.e. AV_PIX_FMT_RGB48LE. + * @param rgb Buffer to fill with RGB data. Format is packed RGB + * 16:16:16, 48bpp, 16R, 16G, 16B, with the 2-byte value for each + * R/G/B component stored as little-endian; i.e. AV_PIX_FMT_RGB48LE. + * @param stride Stride for RGB data in bytes. + * @param note Optional handler for any notes that may be made during the conversion (e.g. when clamping occurs). */ void dcp::xyz_to_rgb ( - shared_ptr xyz_image, + shared_ptr xyz_image, ColourConversion const & conversion, - shared_ptr rgb, + uint8_t* rgb, + int stride, optional note ) { struct { double x, y, z; } s; - + struct { double r, g, b; } d; @@ -139,13 +171,22 @@ dcp::xyz_to_rgb ( int* xyz_y = xyz_image->data (1); int* xyz_z = xyz_image->data (2); - double const * lut_in = conversion.in()->lut (12); - double const * lut_out = conversion.out()->lut (16); - boost::numeric::ublas::matrix matrix = conversion.matrix (); - - for (int y = 0; y < xyz_image->size().height; ++y) { - uint16_t* rgb_line = reinterpret_cast (rgb->data()[0] + y * rgb->stride()[0]); - for (int x = 0; x < xyz_image->size().width; ++x) { + double const * lut_in = conversion.out()->lut (12, false); + double const * lut_out = conversion.in()->lut (16, true); + boost::numeric::ublas::matrix const matrix = conversion.xyz_to_rgb (); + + double fast_matrix[9] = { + matrix (0, 0), matrix (0, 1), matrix (0, 2), + matrix (1, 0), matrix (1, 1), matrix (1, 2), + matrix (2, 0), matrix (2, 1), matrix (2, 2) + }; + + int const height = xyz_image->size().height; + int const width = xyz_image->size().width; + + for (int y = 0; y < height; ++y) { + uint16_t* rgb_line = reinterpret_cast (rgb + y * stride); + for (int x = 0; x < width; ++x) { int cx = *xyz_x++; int cy = *xyz_y++; @@ -171,7 +212,7 @@ dcp::xyz_to_rgb ( } cz = max (min (cz, 4095), 0); } - + /* In gamma LUT */ s.x = lut_in[cx]; s.y = lut_in[cy]; @@ -183,36 +224,71 @@ dcp::xyz_to_rgb ( s.z /= DCI_COEFFICIENT; /* XYZ to RGB */ - d.r = ((s.x * matrix(0, 0)) + (s.y * matrix(0, 1)) + (s.z * matrix(0, 2))); - d.g = ((s.x * matrix(1, 0)) + (s.y * matrix(1, 1)) + (s.z * matrix(1, 2))); - d.b = ((s.x * matrix(2, 0)) + (s.y * matrix(2, 1)) + (s.z * matrix(2, 2))); - + d.r = ((s.x * fast_matrix[0]) + (s.y * fast_matrix[1]) + (s.z * fast_matrix[2])); + d.g = ((s.x * fast_matrix[3]) + (s.y * fast_matrix[4]) + (s.z * fast_matrix[5])); + d.b = ((s.x * fast_matrix[6]) + (s.y * fast_matrix[7]) + (s.z * fast_matrix[8])); + d.r = min (d.r, 1.0); d.r = max (d.r, 0.0); - + d.g = min (d.g, 1.0); d.g = max (d.g, 0.0); - + d.b = min (d.b, 1.0); d.b = max (d.b, 0.0); - *rgb_line++ = rint(lut_out[int(rint(d.r * 65535))] * 65535); - *rgb_line++ = rint(lut_out[int(rint(d.g * 65535))] * 65535); - *rgb_line++ = rint(lut_out[int(rint(d.b * 65535))] * 65535); + *rgb_line++ = lrint(lut_out[lrint(d.r * 65535)] * 65535); + *rgb_line++ = lrint(lut_out[lrint(d.g * 65535)] * 65535); + *rgb_line++ = lrint(lut_out[lrint(d.b * 65535)] * 65535); } } } -/** rgb must be packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, with the 2-byte value for each R/G/B component stored as little-endian; - * i.e. AV_PIX_FMT_RGB48LE. +/** @param conversion Colour conversion. + * @param matrix Filled in with the product of the RGB to XYZ matrix, the Bradford transform and the DCI companding. + */ +void +dcp::combined_rgb_to_xyz (ColourConversion const & conversion, double* matrix) +{ + boost::numeric::ublas::matrix const rgb_to_xyz = conversion.rgb_to_xyz (); + boost::numeric::ublas::matrix const bradford = conversion.bradford (); + + matrix[0] = (bradford (0, 0) * rgb_to_xyz (0, 0) + bradford (0, 1) * rgb_to_xyz (1, 0) + bradford (0, 2) * rgb_to_xyz (2, 0)) + * DCI_COEFFICIENT * 65535; + matrix[1] = (bradford (0, 0) * rgb_to_xyz (0, 1) + bradford (0, 1) * rgb_to_xyz (1, 1) + bradford (0, 2) * rgb_to_xyz (2, 1)) + * DCI_COEFFICIENT * 65535; + matrix[2] = (bradford (0, 0) * rgb_to_xyz (0, 2) + bradford (0, 1) * rgb_to_xyz (1, 2) + bradford (0, 2) * rgb_to_xyz (2, 2)) + * DCI_COEFFICIENT * 65535; + matrix[3] = (bradford (1, 0) * rgb_to_xyz (0, 0) + bradford (1, 1) * rgb_to_xyz (1, 0) + bradford (1, 2) * rgb_to_xyz (2, 0)) + * DCI_COEFFICIENT * 65535; + matrix[4] = (bradford (1, 0) * rgb_to_xyz (0, 1) + bradford (1, 1) * rgb_to_xyz (1, 1) + bradford (1, 2) * rgb_to_xyz (2, 1)) + * DCI_COEFFICIENT * 65535; + matrix[5] = (bradford (1, 0) * rgb_to_xyz (0, 2) + bradford (1, 1) * rgb_to_xyz (1, 2) + bradford (1, 2) * rgb_to_xyz (2, 2)) + * DCI_COEFFICIENT * 65535; + matrix[6] = (bradford (2, 0) * rgb_to_xyz (0, 0) + bradford (2, 1) * rgb_to_xyz (1, 0) + bradford (2, 2) * rgb_to_xyz (2, 0)) + * DCI_COEFFICIENT * 65535; + matrix[7] = (bradford (2, 0) * rgb_to_xyz (0, 1) + bradford (2, 1) * rgb_to_xyz (1, 1) + bradford (2, 2) * rgb_to_xyz (2, 1)) + * DCI_COEFFICIENT * 65535; + matrix[8] = (bradford (2, 0) * rgb_to_xyz (0, 2) + bradford (2, 1) * rgb_to_xyz (1, 2) + bradford (2, 2) * rgb_to_xyz (2, 2)) + * DCI_COEFFICIENT * 65535; +} + +/** @param rgb RGB data; packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, + * with the 2-byte value for each R/G/B component stored as + * little-endian; i.e. AV_PIX_FMT_RGB48LE. + * @param size of RGB image in pixels. + * @param stride of RGB data in pixels. */ -shared_ptr +shared_ptr dcp::rgb_to_xyz ( - boost::shared_ptr rgb, - ColourConversion const & conversion + uint8_t const * rgb, + dcp::Size size, + int stride, + ColourConversion const & conversion, + optional note ) { - shared_ptr xyz (new XYZImage (rgb->size ())); + shared_ptr xyz (new OpenJPEGImage (size)); struct { double r, g, b; @@ -222,66 +298,81 @@ dcp::rgb_to_xyz ( double x, y, z; } d; - double const * lut_in = conversion.in()->lut (12); - double const * lut_out = conversion.out()->lut (16); - boost::numeric::ublas::matrix matrix = conversion.matrix (); + double const * lut_in = conversion.in()->lut (12, false); + double const * lut_out = conversion.out()->lut (16, true); - int jn = 0; - for (int y = 0; y < rgb->size().height; ++y) { - uint16_t* p = reinterpret_cast (rgb->data()[0] + y * rgb->stride()[0]); - for (int x = 0; x < rgb->size().width; ++x) { + /* This is is the product of the RGB to XYZ matrix, the Bradford transform and the DCI companding */ + double fast_matrix[9]; + combined_rgb_to_xyz (conversion, fast_matrix); + + int clamped = 0; + int* xyz_x = xyz->data (0); + int* xyz_y = xyz->data (1); + int* xyz_z = xyz->data (2); + for (int y = 0; y < size.height; ++y) { + uint16_t const * p = reinterpret_cast (rgb + y * stride); + for (int x = 0; x < size.width; ++x) { /* In gamma LUT (converting 16-bit to 12-bit) */ s.r = lut_in[*p++ >> 4]; s.g = lut_in[*p++ >> 4]; s.b = lut_in[*p++ >> 4]; - /* RGB to XYZ Matrix */ - d.x = ((s.r * matrix(0, 0)) + (s.g * matrix(0, 1)) + (s.b * matrix(0, 2))); - d.y = ((s.r * matrix(1, 0)) + (s.g * matrix(1, 1)) + (s.b * matrix(1, 2))); - d.z = ((s.r * matrix(2, 0)) + (s.g * matrix(2, 1)) + (s.b * matrix(2, 2))); - - /* DCI companding */ - d.x = d.x * DCI_COEFFICIENT * 65535; - d.y = d.y * DCI_COEFFICIENT * 65535; - d.z = d.z * DCI_COEFFICIENT * 65535; - - DCP_ASSERT (d.x >= 0 && d.x < 65536); - DCP_ASSERT (d.y >= 0 && d.y < 65536); - DCP_ASSERT (d.z >= 0 && d.z < 65536); - - /* Out gamma LUT */ - xyz->data(0)[jn] = lut_out[int(rint(d.x))] * 4095; - xyz->data(1)[jn] = lut_out[int(rint(d.y))] * 4095; - xyz->data(2)[jn] = lut_out[int(rint(d.z))] * 4095; + /* RGB to XYZ, Bradford transform and DCI companding */ + d.x = s.r * fast_matrix[0] + s.g * fast_matrix[1] + s.b * fast_matrix[2]; + d.y = s.r * fast_matrix[3] + s.g * fast_matrix[4] + s.b * fast_matrix[5]; + d.z = s.r * fast_matrix[6] + s.g * fast_matrix[7] + s.b * fast_matrix[8]; - ++jn; + /* Clamp */ + + if (d.x < 0 || d.y < 0 || d.z < 0 || d.x > 65535 || d.y > 65535 || d.z > 65535) { + ++clamped; + } + + d.x = max (0.0, d.x); + d.y = max (0.0, d.y); + d.z = max (0.0, d.z); + d.x = min (65535.0, d.x); + d.y = min (65535.0, d.y); + d.z = min (65535.0, d.z); + + /* Out gamma LUT */ + *xyz_x++ = lrint (lut_out[lrint(d.x)] * 4095); + *xyz_y++ = lrint (lut_out[lrint(d.y)] * 4095); + *xyz_z++ = lrint (lut_out[lrint(d.z)] * 4095); } } + if (clamped && note) { + note.get() (DCP_NOTE, String::compose ("%1 XYZ value(s) clamped", clamped)); + } + return xyz; } -/** Image must be packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, with the 2-byte value for each R/G/B component stored as little-endian; - * i.e. AV_PIX_FMT_RGB48LE. +/** @param xyz_16 XYZ image data in packed 16:16:16, 48bpp, 16X, 16Y, + * 16Z, with the 2-byte value for each X/Y/Z component stored as + * little-endian. */ -shared_ptr -dcp::xyz_to_xyz (shared_ptr xyz_16) +shared_ptr +dcp::xyz_to_xyz (uint8_t const * xyz_16, dcp::Size size, int stride) { - shared_ptr xyz_12 (new XYZImage (xyz_16->size ())); + shared_ptr xyz_12 (new OpenJPEGImage (size)); int jn = 0; - for (int y = 0; y < xyz_16->size().height; ++y) { - uint16_t* p = reinterpret_cast (xyz_16->data()[0] + y * xyz_16->stride()[0]); - for (int x = 0; x < xyz_16->size().width; ++x) { + for (int y = 0; y < size.height; ++y) { + uint16_t const * p = reinterpret_cast (xyz_16 + y * stride); + for (int x = 0; x < size.width; ++x) { /* Truncate 16-bit to 12-bit */ + cout << *p << " "; xyz_12->data(0)[jn] = *p++ >> 4; + cout << xyz_12->data(0)[jn] << "\n"; xyz_12->data(1)[jn] = *p++ >> 4; xyz_12->data(2)[jn] = *p++ >> 4; ++jn; } } - + return xyz_12; }