From a2c5200a4b3e04a6284dac7de87bc34957b01fa3 Mon Sep 17 00:00:00 2001 From: Christian König Date: Mon, 23 Nov 2015 15:21:19 +0100 Subject: st/va: disable MPEG4 by default v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Emil Velikov (v1) Reviewed-by: Ilia Mirkin (v1) Cc: "11.1.0" --- src/gallium/state_trackers/va/config.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/gallium/state_trackers/va/config.c') 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; -- cgit v1.2.3