summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/colour_conversion.cc82
-rw-r--r--src/lib/config.cc4
-rw-r--r--src/lib/image.cc32
-rw-r--r--src/lib/image.h6
-rw-r--r--src/lib/j2k_image_proxy.cc4
-rw-r--r--src/lib/player.cc1
-rw-r--r--src/lib/player_video.cc7
7 files changed, 105 insertions, 31 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 4bf84281d..3c076b030 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -22,6 +22,7 @@
#include "util.h"
#include "md5_digester.h"
#include "raw_convert.h"
+#include <dcp/chromaticity.h>
#include <dcp/colour_matrix.h>
#include <dcp/gamma_transfer_function.h>
#include <dcp/modified_gamma_transfer_function.h>
@@ -61,10 +62,9 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
cxml::ConstNodePtr in_node = node->node_child ("InputTransferFunction");
string in_type = in_node->string_child ("Type");
if (in_type == "Gamma") {
- _in.reset (new dcp::GammaTransferFunction (false, in_node->number_child<double> ("Gamma")));
+ _in.reset (new dcp::GammaTransferFunction (in_node->number_child<double> ("Gamma")));
} else if (in_type == "ModifiedGamma") {
_in.reset (new dcp::ModifiedGammaTransferFunction (
- false,
in_node->number_child<double> ("Power"),
in_node->number_child<double> ("Threshold"),
in_node->number_child<double> ("A"),
@@ -77,20 +77,46 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
/* Version 1.x */
if (node->bool_child ("InputGammaLinearised")) {
- _in.reset (new dcp::ModifiedGammaTransferFunction (false, node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
+ _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
} else {
- _in.reset (new dcp::GammaTransferFunction (false, node->number_child<float> ("InputGamma")));
+ _in.reset (new dcp::GammaTransferFunction (node->number_child<float> ("InputGamma")));
}
}
+ _yuv_to_rgb = static_cast<dcp::YUVToRGB> (node->optional_number_child<int>("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601));
+
list<cxml::NodePtr> m = node->node_children ("Matrix");
- for (list<cxml::NodePtr>::iterator i = m.begin(); i != m.end(); ++i) {
- int const ti = (*i)->number_attribute<int> ("i");
- int const tj = (*i)->number_attribute<int> ("j");
- _matrix(ti, tj) = raw_convert<double> ((*i)->content ());
- }
+ if (!m.empty ()) {
+ /* Read in old <Matrix> nodes and convert them to chromaticities */
+ boost::numeric::ublas::matrix<double> C (3, 3);
+ for (list<cxml::NodePtr>::iterator i = m.begin(); i != m.end(); ++i) {
+ int const ti = (*i)->number_attribute<int> ("i");
+ int const tj = (*i)->number_attribute<int> ("j");
+ C(ti, tj) = raw_convert<double> ((*i)->content ());
+ }
+
+ double const rd = C(0, 0) + C(1, 0) + C(2, 0);
+ _red = dcp::Chromaticity (C(0, 0) / rd, C(1, 0) / rd);
+ double const gd = C(0, 1) + C(1, 1) + C(2, 1);
+ _green = dcp::Chromaticity (C(0, 1) / gd, C(1, 1) / gd);
+ double const bd = C(0, 2) + C(1, 2) + C(2, 2);
+ _blue = dcp::Chromaticity (C(0, 2) / bd, C(1, 2) / bd);
+ double const wd = C(0, 0) + C(0, 1) + C(0, 2) + C(1, 0) + C(1, 1) + C(1, 2) + C(2, 0) + C(2, 1) + C(2, 2);
+ _white = dcp::Chromaticity ((C(0, 0) + C(0, 1) + C(0, 2)) / wd, (C(1, 0) + C(1, 1) + C(1, 2)) / wd);
+ } else {
+ /* New-style chromaticities */
+ _red = dcp::Chromaticity (node->number_child<double> ("RedX"), node->number_child<double> ("RedY"));
+ _green = dcp::Chromaticity (node->number_child<double> ("GreenX"), node->number_child<double> ("GreenY"));
+ _blue = dcp::Chromaticity (node->number_child<double> ("BlueX"), node->number_child<double> ("BlueY"));
+ _white = dcp::Chromaticity (node->number_child<double> ("WhiteX"), node->number_child<double> ("WhiteY"));
+ if (node->optional_node_child ("AdjustedWhiteX")) {
+ _adjusted_white = dcp::Chromaticity (
+ node->number_child<double> ("AdjustedWhiteX"), node->number_child<double> ("AdjustedWhiteY")
+ );
+ }
+ }
- _out.reset (new dcp::GammaTransferFunction (true, node->number_child<double> ("OutputGamma")));
+ _out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
}
boost::optional<ColourConversion>
@@ -120,14 +146,17 @@ ColourConversion::as_xml (xmlpp::Node* node) const
in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
}
- boost::numeric::ublas::matrix<double> matrix = _matrix;
- for (int i = 0; i < 3; ++i) {
- for (int j = 0; j < 3; ++j) {
- xmlpp::Element* m = node->add_child("Matrix");
- m->set_attribute ("i", raw_convert<string> (i));
- m->set_attribute ("j", raw_convert<string> (j));
- m->add_child_text (raw_convert<string> (matrix (i, j)));
- }
+ node->add_child("RedX")->add_child_text (raw_convert<string> (_red.x));
+ node->add_child("RedY")->add_child_text (raw_convert<string> (_red.y));
+ node->add_child("GreenX")->add_child_text (raw_convert<string> (_green.x));
+ node->add_child("GreenY")->add_child_text (raw_convert<string> (_green.y));
+ node->add_child("BlueX")->add_child_text (raw_convert<string> (_blue.x));
+ node->add_child("BlueY")->add_child_text (raw_convert<string> (_blue.y));
+ node->add_child("WhiteX")->add_child_text (raw_convert<string> (_white.x));
+ node->add_child("WhiteY")->add_child_text (raw_convert<string> (_white.y));
+ if (_adjusted_white) {
+ node->add_child("AdjustedWhiteX")->add_child_text (raw_convert<string> (_adjusted_white.get().x));
+ node->add_child("AdjustedWhiteY")->add_child_text (raw_convert<string> (_adjusted_white.get().y));
}
node->add_child("OutputGamma")->add_child_text (raw_convert<string> (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ()));
@@ -165,11 +194,18 @@ ColourConversion::identifier () const
digester.add (tf->B ());
}
- boost::numeric::ublas::matrix<double> matrix = _matrix;
- for (int i = 0; i < 3; ++i) {
- for (int j = 0; j < 3; ++j) {
- digester.add (matrix (i, j));
- }
+ digester.add (_red.x);
+ digester.add (_red.y);
+ digester.add (_green.x);
+ digester.add (_green.y);
+ digester.add (_blue.x);
+ digester.add (_blue.y);
+ digester.add (_white.x);
+ digester.add (_white.y);
+
+ if (_adjusted_white) {
+ digester.add (_adjusted_white.get().x);
+ digester.add (_adjusted_white.get().y);
}
digester.add (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ());
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c75eaa0f5..ab57c1afc 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -83,6 +83,7 @@ Config::set_defaults ()
_win32_console = false;
#endif
+ _allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
_allowed_dcp_frame_rates.push_back (25);
_allowed_dcp_frame_rates.push_back (30);
@@ -90,8 +91,11 @@ Config::set_defaults ()
_allowed_dcp_frame_rates.push_back (50);
_allowed_dcp_frame_rates.push_back (60);
+ _colour_conversions.clear ();
_colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
+ _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
+ _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ()));
set_kdm_email_to_default ();
}
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 177219813..bba5eeda1 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -87,7 +87,9 @@ Image::components () const
/** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */
shared_ptr<Image>
-Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) const
+Image::crop_scale_window (
+ Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned
+ ) const
{
/* Empirical testing suggests that sws_scale() will crash if
the input image is not aligned.
@@ -115,6 +117,19 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, A
throw StringError (N_("Could not allocate SwsContext"));
}
+ DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
+ int const lut[dcp::YUV_TO_RGB_COUNT] = {
+ SWS_CS_ITU601,
+ SWS_CS_ITU709
+ };
+
+ sws_setColorspaceDetails (
+ scale_context,
+ sws_getCoefficients (lut[yuv_to_rgb]), 0,
+ sws_getCoefficients (lut[yuv_to_rgb]), 0,
+ 0, 1 << 16, 1 << 16
+ );
+
/* Prepare input data pointers with crop */
uint8_t* scale_in_data[components()];
for (int c = 0; c < components(); ++c) {
@@ -142,7 +157,7 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, A
}
shared_ptr<Image>
-Image::scale (dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) const
+Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned) const
{
/* Empirical testing suggests that sws_scale() will crash if
the input image is not aligned.
@@ -157,6 +172,19 @@ Image::scale (dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) co
SWS_BICUBIC, 0, 0, 0
);
+ DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
+ int const lut[dcp::YUV_TO_RGB_COUNT] = {
+ SWS_CS_ITU601,
+ SWS_CS_ITU709
+ };
+
+ sws_setColorspaceDetails (
+ scale_context,
+ sws_getCoefficients (lut[yuv_to_rgb]), 0,
+ sws_getCoefficients (lut[yuv_to_rgb]), 0,
+ 0, 1 << 16, 1 << 16
+ );
+
sws_scale (
scale_context,
data(), stride(),
diff --git a/src/lib/image.h b/src/lib/image.h
index 2e90a89e9..5c3931102 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,6 +27,7 @@
#include "position.h"
#include "position_image.h"
#include "types.h"
+#include <dcp/colour_conversion.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavfilter/avfilter.h>
@@ -57,10 +58,9 @@ public:
int line_factor (int) const;
int lines (int) const;
- boost::shared_ptr<Image> scale (dcp::Size, AVPixelFormat, bool aligned) const;
+ boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
-
- boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, AVPixelFormat, bool aligned) const;
+ boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
void make_black ();
void make_transparent ();
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 16b886169..59106098a 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -82,9 +82,9 @@ J2KImageProxy::image (optional<dcp::NoteHandler> note) const
shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
if (_mono) {
- dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+ dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
} else {
- dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+ dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
}
return image;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index e3c85ee56..495d20533 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -280,6 +280,7 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
PositionImage (
i->image->scale (
scaled_size,
+ dcp::YUV_TO_RGB_REC601,
i->image->pixel_format (),
true
),
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index aad75889f..81e01329a 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -110,8 +110,13 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan
default:
break;
}
+
+ dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+ if (_colour_conversion) {
+ yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
+ }
- shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, pixel_format, true);
+ shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format, true);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-13 22:10:11 +0000