More tests.

[libdcp.git] / src / rgb_xyz.cc

diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index 72ee38c1c5802a91d0ea5a5d3aae392c78779d7b..f53a51ea8188f83d46ec2098513d68ec251e7905 100644 (file)
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -32,14 +32,14 @@ using namespace dcp;
 
 #define DCI_COEFFICIENT (48.0 / 52.37)
 
-/** Convert an openjpeg XYZ image to RGB.
+/** Convert an openjpeg XYZ image to RGBA.
  *  @param xyz_frame Frame in XYZ.
  *  @param lut_in Input Gamma LUT to use.
  *  @param lut_out Output Gamma LUT to use.
  *  @return RGB image.
  */
 shared_ptr<ARGBFrame>
-dcp::xyz_to_rgb (
+dcp::xyz_to_rgba (
        boost::shared_ptr<const XYZFrame> xyz_frame,
        boost::shared_ptr<const GammaLUT> lut_in,
        boost::shared_ptr<const GammaLUT> lut_out
@@ -106,6 +106,79 @@ dcp::xyz_to_rgb (
        return argb_frame;
 }
 
+/** Convert an openjpeg XYZ image to RGB.
+ *  @param xyz_frame Frame in XYZ.
+ *  @param lut_in Input Gamma LUT to use.
+ *  @param lut_out Output Gamma LUT to use.
+ *  @param buffer Buffer to write RGB data to; will be written
+ *  as one byte R, one byte G, one byte B, one byte R etc. with
+ *  no padding at line ends.
+ */
+void
+dcp::xyz_to_rgb (
+       boost::shared_ptr<const XYZFrame> xyz_frame,
+       boost::shared_ptr<const GammaLUT> lut_in,
+       boost::shared_ptr<const GammaLUT> lut_out,
+       uint8_t* buffer
+       )
+{
+       int const max_colour = pow (2, lut_out->bit_depth()) - 1;
+
+       struct {
+               double x, y, z;
+       } s;
+       
+       struct {
+               double r, g, b;
+       } d;
+       
+       int* xyz_x = xyz_frame->data (0);
+       int* xyz_y = xyz_frame->data (1);
+       int* xyz_z = xyz_frame->data (2);
+
+       for (int y = 0; y < xyz_frame->size().height; ++y) {
+               uint8_t* buffer_line = buffer;
+               for (int x = 0; x < xyz_frame->size().width; ++x) {
+
+                       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->lut()[*xyz_x++];
+                       s.y = lut_in->lut()[*xyz_y++];
+                       s.z = lut_in->lut()[*xyz_z++];
+
+                       /* DCI companding */
+                       s.x /= DCI_COEFFICIENT;
+                       s.y /= DCI_COEFFICIENT;
+                       s.z /= DCI_COEFFICIENT;
+
+                       /* XYZ to RGB */
+                       d.r = ((s.x * colour_matrix::xyz_to_rgb[0][0]) + (s.y * colour_matrix::xyz_to_rgb[0][1]) + (s.z * colour_matrix::xyz_to_rgb[0][2]));
+                       d.g = ((s.x * colour_matrix::xyz_to_rgb[1][0]) + (s.y * colour_matrix::xyz_to_rgb[1][1]) + (s.z * colour_matrix::xyz_to_rgb[1][2]));
+                       d.b = ((s.x * colour_matrix::xyz_to_rgb[2][0]) + (s.y * colour_matrix::xyz_to_rgb[2][1]) + (s.z * colour_matrix::xyz_to_rgb[2][2]));
+                       
+                       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 */
+                       *buffer_line++ = lut_out->lut()[(int) (d.r * max_colour)] * 0xff;
+                       *buffer_line++ = lut_out->lut()[(int) (d.g * max_colour)] * 0xff;
+                       *buffer_line++ = lut_out->lut()[(int) (d.b * max_colour)] * 0xff;
+               }
+               
+               buffer += xyz_frame->size().width * 3;
+       }
+}
+
+/** 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.
+ */
 shared_ptr<dcp::XYZFrame>
 dcp::rgb_to_xyz (
        boost::shared_ptr<const Image> rgb,
@@ -129,13 +202,13 @@ dcp::rgb_to_xyz (
 
        int jn = 0;
        for (int y = 0; y < rgb->size().height; ++y) {
-               uint8_t* p = rgb->data()[0] + y * rgb->stride()[0];
+               uint16_t* p = reinterpret_cast<uint16_t *> (rgb->data()[0] + y * rgb->stride()[0]);
                for (int x = 0; x < rgb->size().width; ++x) {
 
-                       /* In gamma LUT (converting 8-bit input to 12-bit) */
-                       s.r = lut_in->lut()[*p++ << 4];
-                       s.g = lut_in->lut()[*p++ << 4];
-                       s.b = lut_in->lut()[*p++ << 4];
+                       /* In gamma LUT (converting 16-bit to 12-bit) */
+                       s.r = lut_in->lut()[*p++ >> 4];
+                       s.g = lut_in->lut()[*p++ >> 4];
+                       s.b = lut_in->lut()[*p++ >> 4];
                        
                        /* RGB to XYZ Matrix */
                        d.x = ((s.r * colour_matrix[0][0]) +
@@ -170,3 +243,27 @@ dcp::rgb_to_xyz (
 
        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.
+ */
+shared_ptr<dcp::XYZFrame>
+dcp::xyz_to_xyz (shared_ptr<const Image> xyz_16)
+{
+       shared_ptr<XYZFrame> xyz_12 (new XYZFrame (xyz_16->size ()));
+
+       int jn = 0;
+       for (int y = 0; y < xyz_16->size().height; ++y) {
+               uint16_t* p = reinterpret_cast<uint16_t *> (xyz_16->data()[0] + y * xyz_16->stride()[0]);
+               for (int x = 0; x < xyz_16->size().width; ++x) {
+                       /* Truncate 16-bit to 12-bit */
+                       xyz_12->data(0)[jn] = *p++ >> 4;
+                       xyz_12->data(1)[jn] = *p++ >> 4;
+                       xyz_12->data(2)[jn] = *p++ >> 4;
+                       ++jn;
+               }
+       }
+       
+       return xyz_12;
+}