Merge branch 'master' into pipe-video

[mesa.git] / src / gallium / include / pipe / p_format.h

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 22cc7aa18a25fc2f5cb65c646c9b5af0cb6d57ff..9a59c9f9ea0600d6cf77a12ec9ade7b124c57bec 100644 (file)
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -186,6 +186,18 @@ enum pipe_format {
    PIPE_FORMAT_R8G8B8X8_UNORM          = 134,
    PIPE_FORMAT_B4G4R4X4_UNORM          = 135,
 
+   PIPE_FORMAT_YV12                  = 136,
+   PIPE_FORMAT_YV16                  = 137,
+   PIPE_FORMAT_IYUV                  = 138,  /**< aka I420 */
+   PIPE_FORMAT_NV12                  = 139,
+   PIPE_FORMAT_NV21                  = 140,
+   PIPE_FORMAT_AYUV                  = PIPE_FORMAT_A8R8G8B8_UNORM,
+   PIPE_FORMAT_VUYA                  = PIPE_FORMAT_B8G8R8A8_UNORM,
+   PIPE_FORMAT_XYUV                  = PIPE_FORMAT_X8R8G8B8_UNORM,
+   PIPE_FORMAT_VUYX                  = PIPE_FORMAT_B8G8R8X8_UNORM,
+   PIPE_FORMAT_IA44                  = 141,
+   PIPE_FORMAT_AI44                  = 142,
+
    /* some stencil samplers formats */
    PIPE_FORMAT_X24S8_USCALED           = 136,
    PIPE_FORMAT_S8X24_USCALED           = 137,
@@ -193,6 +205,12 @@ enum pipe_format {
    PIPE_FORMAT_COUNT
 };
 
+enum pipe_video_chroma_format
+{
+   PIPE_VIDEO_CHROMA_FORMAT_420,
+   PIPE_VIDEO_CHROMA_FORMAT_422,
+   PIPE_VIDEO_CHROMA_FORMAT_444
+};
 
 #ifdef __cplusplus
 }