From 028a6d7a5939b114472f16c3436a30f72165165f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Dec 2016 16:14:02 +0000 Subject: [PATCH] Add tentative S-Gamut3/S-Log3 colourspace support. --- src/colour_conversion.cc | 25 +++++++++- src/colour_conversion.h | 1 + src/identity_transfer_function.cc | 63 +++++++++++++++++++++++++ src/identity_transfer_function.h | 51 ++++++++++++++++++++ src/s_gamut3_transfer_function.cc | 78 +++++++++++++++++++++++++++++++ src/s_gamut3_transfer_function.h | 51 ++++++++++++++++++++ src/wscript | 4 ++ 7 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 src/identity_transfer_function.cc create mode 100644 src/identity_transfer_function.h create mode 100644 src/s_gamut3_transfer_function.cc create mode 100644 src/s_gamut3_transfer_function.h diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc index 16915c72..26e53619 100644 --- a/src/colour_conversion.cc +++ b/src/colour_conversion.cc @@ -34,6 +34,8 @@ #include "colour_conversion.h" #include "gamma_transfer_function.h" #include "modified_gamma_transfer_function.h" +#include "s_gamut3_transfer_function.h" +#include "identity_transfer_function.h" #include "colour_matrix.h" #include "dcp_assert.h" #include @@ -143,6 +145,25 @@ ColourConversion::rec2020_to_xyz () return *c; } +/** Sony S-Gamut3/S-Log3 */ +ColourConversion const & +ColourConversion::s_gamut3_to_xyz () +{ + static ColourConversion* c = new ColourConversion ( + shared_ptr (new SGamut3TransferFunction ()), + YUV_TO_RGB_REC709, + Chromaticity (0.73, 0.280), + Chromaticity (0.140, 0.855), + Chromaticity (0.100, -0.050), + Chromaticity::D65 (), + optional (), + shared_ptr (new IdentityTransferFunction ()) + ); + return *c; +} + + + ColourConversion::ColourConversion ( shared_ptr in, YUVToRGB yuv_to_rgb, @@ -174,7 +195,9 @@ ColourConversion::about_equal (ColourConversion const & other, float epsilon) co !_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; } diff --git a/src/colour_conversion.h b/src/colour_conversion.h index 9b88a853..51762d8b 100644 --- a/src/colour_conversion.h +++ b/src/colour_conversion.h @@ -155,6 +155,7 @@ public: static ColourConversion const & p3_to_xyz (); static ColourConversion const & rec1886_to_xyz (); static ColourConversion const & rec2020_to_xyz (); + static ColourConversion const & s_gamut3_to_xyz (); protected: /** Input transfer function (probably a gamma function, or something similar) */ diff --git a/src/identity_transfer_function.cc b/src/identity_transfer_function.cc new file mode 100644 index 00000000..1edc61da --- /dev/null +++ b/src/identity_transfer_function.cc @@ -0,0 +1,63 @@ +/* + Copyright (C) 2016 Carl Hetherington + + 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. + + 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 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/identity_transfer_function.cc + * @brief IdentityTransferFunction class. + */ + +#include "identity_transfer_function.h" +#include + +using std::pow; +using boost::shared_ptr; +using boost::dynamic_pointer_cast; +using namespace dcp; + +double * +IdentityTransferFunction::make_lut (int bit_depth, bool) const +{ + int const bit_length = int(std::pow(2.0f, bit_depth)); + double* lut = new double[bit_length]; + for (int i = 0; i < bit_length; ++i) { + lut[i] = double(i) / (bit_length - 1); + } + + return lut; +} + +bool +IdentityTransferFunction::about_equal (shared_ptr other, double) const +{ + shared_ptr o = dynamic_pointer_cast (other); + return static_cast(o); +} diff --git a/src/identity_transfer_function.h b/src/identity_transfer_function.h new file mode 100644 index 00000000..f157cd6f --- /dev/null +++ b/src/identity_transfer_function.h @@ -0,0 +1,51 @@ +/* + Copyright (C) 2016 Carl Hetherington + + 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. + + 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 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/identity_transfer_function.h + * @brief IdentityTransferFunction class. + */ + +#include "transfer_function.h" + +namespace dcp { + +class IdentityTransferFunction : public TransferFunction +{ +public: + bool about_equal (boost::shared_ptr other, double epsilon) const; + +protected: + double * make_lut (int bit_depth, bool inverse) const; +}; + +} diff --git a/src/s_gamut3_transfer_function.cc b/src/s_gamut3_transfer_function.cc new file mode 100644 index 00000000..371aebac --- /dev/null +++ b/src/s_gamut3_transfer_function.cc @@ -0,0 +1,78 @@ +/* + Copyright (C) 2012-2014 Carl Hetherington + + 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. + + 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 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/s_gamut3_transfer_function.cc + * @brief SGamut3TransferFunction class. + */ + +#include "s_gamut3_transfer_function.h" +#include + +using std::pow; +using boost::shared_ptr; +using boost::dynamic_pointer_cast; +using namespace dcp; + +double * +SGamut3TransferFunction::make_lut (int bit_depth, bool inverse) const +{ + int const bit_length = int(std::pow(2.0f, bit_depth)); + double* lut = new double[bit_length]; + if (inverse) { + for (int i = 0; i < bit_length; ++i) { + double const p = static_cast (i) / (bit_length - 1); + if (p >= (0.01125 / 1023)) { + lut[i] = (420 + log10((p + 0.01) / (0.18 + 0.01)) * 261.5) / 1023; + } else { + lut[i] = (p * (171.2102946929 - 95) / 0.01125000 + 95) / 1023; + } + } + } else { + for (int i = 0; i < bit_length; ++i) { + double const p = static_cast (i) / (bit_length - 1); + if (p >= (171.2102946929 / 1023)) { + lut[i] = pow(10, ((p * 1023 - 420) / 261.5)) * (0.18 + 0.01) - 0.01; + } else { + lut[i] = (p * 1023 - 95) * 0.01125000 / (171.2102946929 - 95); + } + } + } + return lut; +} + +bool +SGamut3TransferFunction::about_equal (shared_ptr other, double) const +{ + shared_ptr o = dynamic_pointer_cast (other); + return static_cast (o); +} diff --git a/src/s_gamut3_transfer_function.h b/src/s_gamut3_transfer_function.h new file mode 100644 index 00000000..231b4cc6 --- /dev/null +++ b/src/s_gamut3_transfer_function.h @@ -0,0 +1,51 @@ +/* + Copyright (C) 2016 Carl Hetherington + + 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. + + 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 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/s_gamut3_transfer_function.h + * @brief SGamut3TransferFunction class. + */ + +#include "transfer_function.h" + +namespace dcp { + +class SGamut3TransferFunction : public TransferFunction +{ +public: + bool about_equal (boost::shared_ptr other, double epsilon) const; + +protected: + double * make_lut (int bit_depth, bool inverse) const; +}; + +} diff --git a/src/wscript b/src/wscript index 61570bd5..7c3bcc37 100644 --- a/src/wscript +++ b/src/wscript @@ -56,6 +56,7 @@ def build(bld): file.cc font_asset.cc gamma_transfer_function.cc + identity_transfer_function.cc interop_load_font_node.cc interop_subtitle_asset.cc j2k.cc @@ -85,6 +86,7 @@ def build(bld): reel_subtitle_asset.cc ref.cc rgb_xyz.cc + s_gamut3_transfer_function.cc smpte_load_font_node.cc smpte_subtitle_asset.cc sound_asset.cc @@ -128,6 +130,7 @@ def build(bld): font_asset.h frame.h gamma_transfer_function.h + identity_transfer_function.h interop_load_font_node.h interop_subtitle_asset.h j2k.h @@ -158,6 +161,7 @@ def build(bld): reel_stereo_picture_asset.h reel_subtitle_asset.h ref.h + s_gamut3_transfer_function.h smpte_load_font_node.h smpte_subtitle_asset.h sound_frame.h -- 2.30.2