/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ 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 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 <http://www.gnu.org/licenses/>.
+
+ 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 "colour_conversion.h"
#include "gamma_transfer_function.h"
#include "modified_gamma_transfer_function.h"
-#include "colour_matrix.h"
+#include "s_gamut3_transfer_function.h"
+#include "identity_transfer_function.h"
#include "dcp_assert.h"
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/lu.hpp>
#include <boost/numeric/ublas/io.hpp>
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using namespace dcp;
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
ColourConversion::rec601_to_xyz ()
{
static ColourConversion* c = new ColourConversion (
- shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (1 / 0.45, 0.081, 0.099, 4.5)),
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
YUV_TO_RGB_REC601,
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
ColourConversion::rec709_to_xyz ()
{
static ColourConversion* c = new ColourConversion (
- shared_ptr<const TransferFunction> (new ModifiedGammaTransferFunction (1 / 0.45, 0.081, 0.099, 4.5)),
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.2)),
YUV_TO_RGB_REC709,
Chromaticity (0.64, 0.33),
Chromaticity (0.3, 0.6),
Chromaticity (0.15, 0.06),
- /* D65 */
- Chromaticity (0.3127, 0.329),
+ Chromaticity::D65 (),
optional<Chromaticity> (),
shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
);
return *c;
}
+ColourConversion const &
+ColourConversion::rec1886_to_xyz ()
+{
+ /* According to Olivier on DCP-o-matic bug #832, Rec. 1886 is Rec. 709 with
+ 2.4 gamma, so here goes ...
+ */
+ static ColourConversion* c = new ColourConversion (
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.4)),
+ YUV_TO_RGB_REC709,
+ Chromaticity (0.64, 0.33),
+ Chromaticity (0.3, 0.6),
+ Chromaticity (0.15, 0.06),
+ Chromaticity::D65 (),
+ optional<Chromaticity> (),
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+ );
+ return *c;
+}
+
+ColourConversion const &
+ColourConversion::rec2020_to_xyz ()
+{
+ static ColourConversion* c = new ColourConversion (
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.4)),
+ YUV_TO_RGB_REC709,
+ Chromaticity (0.708, 0.292),
+ Chromaticity (0.170, 0.797),
+ Chromaticity (0.131, 0.046),
+ Chromaticity::D65 (),
+ optional<Chromaticity> (),
+ shared_ptr<const TransferFunction> (new GammaTransferFunction (2.6))
+ );
+ return *c;
+}
+
+/** Sony S-Gamut3/S-Log3 */
+ColourConversion const &
+ColourConversion::s_gamut3_to_xyz ()
+{
+ static ColourConversion* c = new ColourConversion (
+ shared_ptr<const TransferFunction> (new SGamut3TransferFunction ()),
+ YUV_TO_RGB_REC709,
+ Chromaticity (0.73, 0.280),
+ Chromaticity (0.140, 0.855),
+ Chromaticity (0.100, -0.050),
+ Chromaticity::D65 (),
+ optional<Chromaticity> (),
+ shared_ptr<const TransferFunction> (new IdentityTransferFunction ())
+ );
+ return *c;
+}
+
+
+
ColourConversion::ColourConversion (
shared_ptr<const TransferFunction> in,
YUVToRGB yuv_to_rgb,
, _adjusted_white (adjusted_white)
, _out (out)
{
-
+
}
bool
!_green.about_equal (other._green, epsilon) ||
!_blue.about_equal (other._blue, epsilon) ||
!_white.about_equal (other._white, epsilon) ||
- !_out->about_equal (other._out, epsilon)) {
+ (!_out && other._out) ||
+ (_out && !other._out) ||
+ (_out && !_out->about_equal (other._out, epsilon))) {
return false;
}
/* backsubstitute to get the inverse */
lu_substitute (A, pm, xyz_to_rgb);
-
+
return xyz_to_rgb;
}
projects / libdcp.git / blobdiff