projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virgl: clean up virgl_res_needs_flush
[mesa.git]
/
src
/
gallium
/
include
/
pipe
/
p_video_enums.h
diff --git
a/src/gallium/include/pipe/p_video_enums.h
b/src/gallium/include/pipe/p_video_enums.h
index 9a20146f43e670d992035532a602ff700b887549..adbe7858d0f337820043a62bb5c5737bb331de69 100644
(file)
--- 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
#ifndef PIPE_VIDEO_ENUMS_H
#define PIPE_VIDEO_ENUMS_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum pipe_video_format
{
PIPE_VIDEO_FORMAT_UNKNOWN = 0,
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_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
};
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_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,
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_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 */
};
/* Video caps, can be different for each codec/profile */
@@
-87,4
+98,8
@@
enum pipe_video_entrypoint
PIPE_VIDEO_ENTRYPOINT_ENCODE
};
PIPE_VIDEO_ENTRYPOINT_ENCODE
};
+#if defined(__cplusplus)
+}
+#endif
+
#endif /* PIPE_VIDEO_ENUMS_H */
#endif /* PIPE_VIDEO_ENUMS_H */