From 11ccb56e9fe7a032a4f7a303580e4811717ae97b Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 15 Aug 2017 14:21:16 -0400 Subject: vl: add MJPEG profile and format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2: move util video change to here Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/include/pipe/p_video_enums.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gallium/include/pipe') diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 1e05075bed7..2b7186857a7 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -39,7 +39,8 @@ 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 */ }; enum pipe_video_profile @@ -65,7 +66,8 @@ 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 }; /* Video caps, can be different for each codec/profile */ -- cgit v1.2.3