From 49eda4d7426799aa3cef0ab3b798c88a5dc76884 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 27 Jun 2024 12:09:04 +0200 Subject: [PATCH] frontends/va: Don't require exact match for packed headers Apparently it's valid to create config with any combination of supported packed headers. Fixes libva-utils tests: GetCreateConfig/VAAPIGetCreateConfig.CreateConfigWithAttributes/235, where GetParam() = (32:VAProfileAV1Profile0, 6:VAEntrypointEncSlice) GetCreateConfig/VAAPIGetCreateConfig.CreateConfigPackedHeaders/235, where GetParam() = (32:VAProfileAV1Profile0, 6:VAEntrypointEncSlice) QuerySurfaces/VAAPIQuerySurfaces.QuerySurfacesWithConfigAttribs/235, where GetParam() = (32:VAProfileAV1Profile0, 6:VAEntrypointEncSlice) CreateSurfaces/VAAPICreateSurfaces.CreateSurfacesWithConfigAttribs/3995, where GetParam() = (32:VAProfileAV1Profile0, 6:VAEntrypointEncSlice, 16x16) Reviewed-by: Ruijing Dong Part-of: --- src/gallium/frontends/va/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/frontends/va/config.c b/src/gallium/frontends/va/config.c index 868e568a1a3..f27a36b2c3f 100644 --- a/src/gallium/frontends/va/config.c +++ b/src/gallium/frontends/va/config.c @@ -722,7 +722,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin != PIPE_VIDEO_FORMAT_MPEG4_AVC) && ((attrib_list[i].value != 1) || u_reduce_video_profile(ProfileToPipe(profile)) != PIPE_VIDEO_FORMAT_HEVC) && - ((attrib_list[i].value != 3) || u_reduce_video_profile(ProfileToPipe(profile)) + ((attrib_list[i].value > 3) || u_reduce_video_profile(ProfileToPipe(profile)) != PIPE_VIDEO_FORMAT_AV1))) { FREE(config); return VA_STATUS_ERROR_INVALID_VALUE;