fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-23 09:40:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vl: fix codec checks to disable properly

Browse source 
This was wrong and enabled codecs where they shouldn't have been.

Fixes: 7ab05e3c3f ("gallium/vl: respect the video codecs configure in meson")
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16542>
This commit is contained in:
Dave Airlie 2022-05-17 10:05:50 +10:00 • committed by Marge Bot
parent 74976640b3
commit 9c45b541e6
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gallium/auxiliary/vl/vl_codec.c
View file

@ -35,21 +35,26 @@ bool vl_codec_supported(struct pipe_screen *screen,
if (profile == PIPE_VIDEO_PROFILE_VC1_SIMPLE ||
profile == PIPE_VIDEO_PROFILE_VC1_MAIN ||
profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED) {
return VIDEO_CODEC_VC1DEC ? true : false;
if (!VIDEO_CODEC_VC1DEC)
return false;
}
if (profile >= PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE &&
profile <= PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH444) {
if (encode)
return VIDEO_CODEC_H264ENC ? true : false;
else
return VIDEO_CODEC_H264DEC ? true : false;
if (encode) {
if (!VIDEO_CODEC_H264ENC)
return false;
} else if (!VIDEO_CODEC_H264DEC) {
return false;
}
}
if (profile >= PIPE_VIDEO_PROFILE_HEVC_MAIN &&
profile <= PIPE_VIDEO_PROFILE_HEVC_MAIN_444) {
if (encode)
return VIDEO_CODEC_H265ENC ? true : false;
else
return VIDEO_CODEC_H265DEC ? true : false;
if (encode) {
if (!VIDEO_CODEC_H265ENC)
return false;
} else if (!VIDEO_CODEC_H265DEC) {
return false;
}
}
return screen->get_video_param(screen, profile, encode ? PIPE_VIDEO_ENTRYPOINT_ENCODE : PIPE_VIDEO_ENTRYPOINT_BITSTREAM, PIPE_VIDEO_CAP_SUPPORTED);