diff options
| author | Christian König <christian.koenig@amd.com> | 2015-11-23 15:21:19 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2015-12-07 20:34:17 +0100 |
| commit | a2c5200a4b3e04a6284dac7de87bc34957b01fa3 (patch) | |
| tree | 77957ff19fe0b45ff3a553c76689359e6e58c8d1 | |
| parent | ca3e2b76c0f8bc6637fc52109820238da37f7398 (diff) | |
st/va: disable MPEG4 by default v2
The workarounds are too hacky to enable them by default
and otherwise MPEG4 doesn't work reliably.
v2: add docs/envvars.html, CC stable and fix typos
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v1)
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> (v1)
Cc: "11.1.0" <mesa-stable@lists.freedesktop.org>
| -rw-r--r-- | docs/envvars.html | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/va/config.c | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/docs/envvars.html b/docs/envvars.html index 1b2c03ef377..5bb7b1e65bb 100644 --- a/docs/envvars.html +++ b/docs/envvars.html @@ -238,6 +238,12 @@ for details. </ul> +<h3>VA-API state tracker environment variables</h3> +<ul> +<li>VAAPI_MPEG4_ENABLED - enable MPEG4 for VA-API, disabled by default. +</ul> + + <p> Other Gallium drivers have their own environment variables. These may change frequently so the source code should be consulted for details. diff --git a/src/gallium/state_trackers/va/config.c b/src/gallium/state_trackers/va/config.c index a545a18c1e0..9ca0aa8b4ef 100644 --- a/src/gallium/state_trackers/va/config.c +++ b/src/gallium/state_trackers/va/config.c @@ -28,10 +28,14 @@ #include "pipe/p_screen.h" +#include "util/u_video.h" + #include "vl/vl_winsys.h" #include "va_private.h" +DEBUG_GET_ONCE_BOOL_OPTION(mpeg4, "VAAPI_MPEG4_ENABLED", false) + VAStatus vlVaQueryConfigProfiles(VADriverContextP ctx, VAProfile *profile_list, int *num_profiles) { @@ -45,12 +49,16 @@ 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_HEVC_MAIN_444; ++p) { + if (u_reduce_video_profile(p) == PIPE_VIDEO_FORMAT_MPEG4 && !debug_get_option_mpeg4()) + continue; + if (pscreen->get_video_param(pscreen, p, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, PIPE_VIDEO_CAP_SUPPORTED)) { vap = PipeToProfile(p); if (vap != VAProfileNone) profile_list[(*num_profiles)++] = vap; } + } /* Support postprocessing through vl_compositor */ profile_list[(*num_profiles)++] = VAProfileNone; |