Release Movit 1.7.1.

[movit] / image_format.h

diff --git a/image_format.h b/image_format.h
index df6f48747cdc3e933dfa6cdaf6cec88f544b14a3..40067c656782a38017920a7e649c03bb4f34cd3b 100644 (file)
--- a/image_format.h
+++ b/image_format.h
@@ -1,11 +1,17 @@
 #ifndef _MOVIT_IMAGE_FORMAT_H
 #define _MOVIT_IMAGE_FORMAT_H 1
 
-// Note: Input depths above 8 bits have not been tested, so Rec. 2020
-// support should be regarded as somewhat untested (it assumes 10-
-// or 12-bit input). We also only support “conventional non-constant
-// luminance” for Rec. 2020, where Y' is derived from R'G'B' instead of
-// RGB, since this is the same system as used in Rec. 601 and 709.
+// Note: Movit's internal processing formats do not have enough
+// accuracy to support 12-bit input, so if you want to use Rec. 2020,
+// you should probably stick to 10-bit, or accept somewhat reduced
+// accuracy for 12-bit. Input depths above 8 bits are also generally
+// less tested.
+//
+// We also only support “conventional non-constant luminance” for Rec. 2020,
+// where Y' is derived from R'G'B' instead of RGB, since this is the same
+// system as used in Rec. 601 and 709.
+
+namespace movit {
 
 enum MovitPixelFormat {
        FORMAT_RGB,
@@ -14,17 +20,19 @@ enum MovitPixelFormat {
        FORMAT_BGR,
        FORMAT_BGRA_PREMULTIPLIED_ALPHA,
        FORMAT_BGRA_POSTMULTIPLIED_ALPHA,
-       FORMAT_GRAYSCALE
+       FORMAT_GRAYSCALE,
+       FORMAT_RG,
+       FORMAT_R
 };
 
 enum Colorspace {
        COLORSPACE_INVALID = -1,  // For internal use.
-       COLORSPACE_sRGB = 0,
-       COLORSPACE_REC_709 = 0,  // Same as sRGB.
+       COLORSPACE_REC_709 = 0,
        COLORSPACE_REC_601_525 = 1,
        COLORSPACE_REC_601_625 = 2,
        COLORSPACE_XYZ = 3,  // Mostly useful for testing and debugging.
        COLORSPACE_REC_2020 = 4,
+       COLORSPACE_sRGB = 5,  // Used to be same as COLORSPACE_REC_709.
 };
 
 enum GammaCurve {
@@ -48,4 +56,6 @@ struct ImageFormat {
        GammaCurve gamma_curve;
 };
 
+}  // namespace movit
+
 #endif  // !defined(_MOVIT_IMAGE_FORMAT_H)