Support conversion to and from the XYZ color space.

[movit] / image_format.h

diff --git a/image_format.h b/image_format.h
index 2c65724c6af36b42ba836760d7bbb4bd746e587b..f84a0f487ff596f0f65bb864b3b1f3b45dc14748 100644 (file)
--- a/image_format.h
+++ b/image_format.h
@@ -4,13 +4,16 @@
 enum MovitPixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA, FORMAT_GRAYSCALE };
 
 enum ColorSpace {
 enum MovitPixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA, FORMAT_GRAYSCALE };
 
 enum ColorSpace {

+       COLORSPACE_INVALID = -1,  // For internal use.

        COLORSPACE_sRGB = 0,
        COLORSPACE_REC_709 = 0,  // Same as sRGB.
        COLORSPACE_REC_601_525 = 1,
        COLORSPACE_REC_601_625 = 2,
        COLORSPACE_sRGB = 0,
        COLORSPACE_REC_709 = 0,  // Same as sRGB.
        COLORSPACE_REC_601_525 = 1,
        COLORSPACE_REC_601_625 = 2,

+       COLORSPACE_XYZ = 3,  // Mostly useful for testing and debugging.

 };
 
 enum GammaCurve {
 };
 
 enum GammaCurve {

+       GAMMA_INVALID = -1,  // For internal use.

        GAMMA_LINEAR = 0,
        GAMMA_sRGB = 1,
        GAMMA_REC_601 = 2,
        GAMMA_LINEAR = 0,
        GAMMA_sRGB = 1,
        GAMMA_REC_601 = 2,


@@ -23,7 +26,6 @@ enum YCbCrLumaCoefficients {
 };
 
 struct ImageFormat {
 };
 
 struct ImageFormat {

-       MovitPixelFormat pixel_format;

        ColorSpace color_space;
        GammaCurve gamma_curve;
 };
        ColorSpace color_space;
        GammaCurve gamma_curve;
 };