From 03b89547b7c0ad7176f8c9a1d5d78156524ce13e Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 15 Aug 2017 11:44:08 -0400 Subject: [PATCH] st/va: add MJPEG for config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To enable MJPEG HW decode Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/state_trackers/va/config.c | 2 +- src/gallium/state_trackers/va/va_private.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/va/config.c b/src/gallium/state_trackers/va/config.c index 7d3bd648d97..1484fcacce1 100644 --- a/src/gallium/state_trackers/va/config.c +++ b/src/gallium/state_trackers/va/config.c @@ -52,7 +52,7 @@ vlVaQueryConfigProfiles(VADriverContextP ctx, VAProfile *profile_list, int *num_ *num_profiles = 0; pscreen = VL_VA_PSCREEN(ctx); - for (p = PIPE_VIDEO_PROFILE_MPEG2_SIMPLE; p <= PIPE_VIDEO_PROFILE_HEVC_MAIN_444; ++p) { + for (p = PIPE_VIDEO_PROFILE_MPEG2_SIMPLE; p <= PIPE_VIDEO_PROFILE_JPEG_BASELINE; ++p) { if (u_reduce_video_profile(p) == PIPE_VIDEO_FORMAT_MPEG4 && !debug_get_option_mpeg4()) continue; diff --git a/src/gallium/state_trackers/va/va_private.h b/src/gallium/state_trackers/va/va_private.h index 9c093181277..5b1b832bb00 100644 --- a/src/gallium/state_trackers/va/va_private.h +++ b/src/gallium/state_trackers/va/va_private.h @@ -170,6 +170,8 @@ PipeToProfile(enum pipe_video_profile profile) return VAProfileHEVCMain; case PIPE_VIDEO_PROFILE_HEVC_MAIN_10: return VAProfileHEVCMain10; + case PIPE_VIDEO_PROFILE_JPEG_BASELINE: + return VAProfileJPEGBaseline; case PIPE_VIDEO_PROFILE_MPEG4_AVC_EXTENDED: case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH10: case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH422: @@ -214,6 +216,8 @@ ProfileToPipe(VAProfile profile) return PIPE_VIDEO_PROFILE_HEVC_MAIN; case VAProfileHEVCMain10: return PIPE_VIDEO_PROFILE_HEVC_MAIN_10; + case VAProfileJPEGBaseline: + return PIPE_VIDEO_PROFILE_JPEG_BASELINE; case VAProfileNone: return PIPE_VIDEO_PROFILE_UNKNOWN; default: -- 2.30.2