diff options
| author | Leo Liu <[email protected]> | 2019-02-08 08:56:53 -0500 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-02-12 14:19:52 -0800 |
| commit | ab585817e6a34893674b65aba77252d7bff43cc5 (patch) | |
| tree | 21a4bbc4d57ad311dab2574a6323055198d0800b | |
| parent | 75bec50c2a3cba0bb1dd2ac18599d94e81422609 (diff) | |
st/va: fix the incorrect max profiles report
Add "PIPE_VIDEO_PROFILE_MAX" to enum, so it will make sure here will
be correct when adding more profiles in the future.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109107
Signed-off-by: Leo Liu <[email protected]>
Reviewed-by: Boyuan Zhang <[email protected]>
Cc: 19.0 <[email protected]>
(cherry picked from commit 21cdb828a3f4d1e2f140fc7c81a4bc305b2f6b04)
| -rw-r--r-- | src/gallium/include/pipe/p_video_enums.h | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/va/context.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index b5b8b062285..adbe7858d0f 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -70,7 +70,8 @@ enum pipe_video_profile PIPE_VIDEO_PROFILE_HEVC_MAIN_444, PIPE_VIDEO_PROFILE_JPEG_BASELINE, PIPE_VIDEO_PROFILE_VP9_PROFILE0, - PIPE_VIDEO_PROFILE_VP9_PROFILE2 + PIPE_VIDEO_PROFILE_VP9_PROFILE2, + PIPE_VIDEO_PROFILE_MAX }; /* Video caps, can be different for each codec/profile */ diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c index 14e904ee490..47a5e7be230 100644 --- a/src/gallium/state_trackers/va/context.c +++ b/src/gallium/state_trackers/va/context.c @@ -175,7 +175,7 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx) ctx->version_minor = 1; *ctx->vtable = vtable; *ctx->vtable_vpp = vtable_vpp; - ctx->max_profiles = PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH - PIPE_VIDEO_PROFILE_UNKNOWN; + ctx->max_profiles = PIPE_VIDEO_PROFILE_MAX - PIPE_VIDEO_PROFILE_UNKNOWN - 1; ctx->max_entrypoints = 2; ctx->max_attributes = 1; ctx->max_image_formats = VL_VA_MAX_IMAGE_FORMATS; |