X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Finclude%2Fpipe%2Fp_video_enums.h;h=adbe7858d0f337820043a62bb5c5737bb331de69;hb=34810f42373639ee811885d251b97e56e8695e72;hp=9a20146f43e670d992035532a602ff700b887549;hpb=6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df;p=mesa.git

diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
index 9a20146f43e..adbe7858d0f 100644
--- a/src/gallium/include/pipe/p_video_enums.h
+++ b/src/gallium/include/pipe/p_video_enums.h
@@ -28,6 +28,10 @@
 #ifndef PIPE_VIDEO_ENUMS_H
 #define PIPE_VIDEO_ENUMS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum pipe_video_format
 {
    PIPE_VIDEO_FORMAT_UNKNOWN = 0,
@@ -35,7 +39,9 @@ enum pipe_video_format
    PIPE_VIDEO_FORMAT_MPEG4,    /**< DIVX, XVID */
    PIPE_VIDEO_FORMAT_VC1,      /**< WMV */
    PIPE_VIDEO_FORMAT_MPEG4_AVC,/**< H.264 */
-   PIPE_VIDEO_FORMAT_HEVC      /**< H.265 */
+   PIPE_VIDEO_FORMAT_HEVC,     /**< H.265 */
+   PIPE_VIDEO_FORMAT_JPEG,     /**< JPEG */
+   PIPE_VIDEO_FORMAT_VP9       /**< VP9 */
 };
 
 enum pipe_video_profile
@@ -50,6 +56,7 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_VC1_MAIN,
    PIPE_VIDEO_PROFILE_VC1_ADVANCED,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE,
+   PIPE_VIDEO_PROFILE_MPEG4_AVC_CONSTRAINED_BASELINE,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_EXTENDED,
    PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH,
@@ -60,7 +67,11 @@ enum pipe_video_profile
    PIPE_VIDEO_PROFILE_HEVC_MAIN_10,
    PIPE_VIDEO_PROFILE_HEVC_MAIN_STILL,
    PIPE_VIDEO_PROFILE_HEVC_MAIN_12,
-   PIPE_VIDEO_PROFILE_HEVC_MAIN_444
+   PIPE_VIDEO_PROFILE_HEVC_MAIN_444,
+   PIPE_VIDEO_PROFILE_JPEG_BASELINE,
+   PIPE_VIDEO_PROFILE_VP9_PROFILE0,
+   PIPE_VIDEO_PROFILE_VP9_PROFILE2,
+   PIPE_VIDEO_PROFILE_MAX
 };
 
 /* Video caps, can be different for each codec/profile */
@@ -87,4 +98,8 @@ enum pipe_video_entrypoint
    PIPE_VIDEO_ENTRYPOINT_ENCODE
 };
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* PIPE_VIDEO_ENUMS_H */