X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.cc;h=2eccb77a8aec0531af35c69688e3063097e4762e;hb=fe83eb5293fa4027856f6ee9faec7bfc8288badf;hp=a44678f0b0ef79c1f7732fd042eeda1ae946cdf6;hpb=315f98667668ba59b80033429acf10fb3f4e13fe;p=libdcp.git diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index a44678f0..2eccb77a 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -1,20 +1,34 @@ /* 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" @@ -230,6 +244,35 @@ dcp::xyz_to_rgb ( } } +/** @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. @@ -257,21 +300,10 @@ dcp::rgb_to_xyz ( double const * lut_in = conversion.in()->lut (12, false); double const * lut_out = conversion.out()->lut (16, true); - boost::numeric::ublas::matrix const rgb_to_xyz = conversion.rgb_to_xyz (); - boost::numeric::ublas::matrix const bradford = conversion.bradford (); /* This is is the product of the RGB to XYZ matrix, the Bradford transform and the DCI companding */ - double fast_matrix[9] = { - (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, - (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, - (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, - (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, - (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, - (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, - (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, - (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, - (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 - }; + double fast_matrix[9]; + combined_rgb_to_xyz (conversion, fast_matrix); int clamped = 0; int* xyz_x = xyz->data (0); @@ -333,7 +365,9 @@ dcp::xyz_to_xyz (uint8_t const * xyz_16, dcp::Size size, int stride) 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;