X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=image_format.h;h=df6f48747cdc3e933dfa6cdaf6cec88f544b14a3;hb=9ad1a31f02c3de450c650191cc40a194506807bc;hp=852090ef9231a03eeab0ebfa7def1879708a6cbe;hpb=1ca4785183b5af9a2a255bba0a28dfdae156470a;p=movit

diff --git a/image_format.h b/image_format.h
index 852090e..df6f487 100644
--- a/image_format.h
+++ b/image_format.h
@@ -1,7 +1,21 @@
-#ifndef _IMAGE_FORMAT_H
-#define _IMAGE_FORMAT_H 1
+#ifndef _MOVIT_IMAGE_FORMAT_H
+#define _MOVIT_IMAGE_FORMAT_H 1
 
-enum MovitPixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA, FORMAT_GRAYSCALE };
+// 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.
+
+enum MovitPixelFormat {
+	FORMAT_RGB,
+	FORMAT_RGBA_PREMULTIPLIED_ALPHA,
+	FORMAT_RGBA_POSTMULTIPLIED_ALPHA,
+	FORMAT_BGR,
+	FORMAT_BGRA_PREMULTIPLIED_ALPHA,
+	FORMAT_BGRA_POSTMULTIPLIED_ALPHA,
+	FORMAT_GRAYSCALE
+};
 
 enum Colorspace {
 	COLORSPACE_INVALID = -1,  // For internal use.
@@ -10,6 +24,7 @@ enum Colorspace {
 	COLORSPACE_REC_601_525 = 1,
 	COLORSPACE_REC_601_625 = 2,
 	COLORSPACE_XYZ = 3,  // Mostly useful for testing and debugging.
+	COLORSPACE_REC_2020 = 4,
 };
 
 enum GammaCurve {
@@ -18,11 +33,14 @@ enum GammaCurve {
 	GAMMA_sRGB = 1,
 	GAMMA_REC_601 = 2,
 	GAMMA_REC_709 = 2,  // Same as Rec. 601.
+	GAMMA_REC_2020_10_BIT = 2,  // Same as Rec. 601.
+	GAMMA_REC_2020_12_BIT = 3,
 };
 
 enum YCbCrLumaCoefficients {
 	YCBCR_REC_601 = 0,
 	YCBCR_REC_709 = 1,
+	YCBCR_REC_2020 = 2,
 };
 
 struct ImageFormat {
@@ -30,4 +48,4 @@ struct ImageFormat {
 	GammaCurve gamma_curve;
 };
 
-#endif  // !defined(_IMAGE_FORMAT_H)
+#endif  // !defined(_MOVIT_IMAGE_FORMAT_H)