Release Movit 1.7.1.

[movit] / image_format.h

diff --git a/image_format.h b/image_format.h
index 7ca334c36016e4324f0cc75fac9ab8fe87af5cb3..40067c656782a38017920a7e649c03bb4f34cd3b 100644 (file)
--- a/image_format.h
+++ b/image_format.h
@@ -11,6 +11,8 @@
 // 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,
        FORMAT_RGBA_PREMULTIPLIED_ALPHA,
@@ -18,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 {
@@ -52,4 +56,6 @@ struct ImageFormat {
        GammaCurve gamma_curve;
 };
 
+}  // namespace movit
+
 #endif  // !defined(_MOVIT_IMAGE_FORMAT_H)