Module: Mesa
Branch: staging/23.3
Commit: b8112ed6db7e0363dda5eb40832395f5786d8bcf
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8112ed6db7e0363dda5eb40832395f5786d8bcf
Author: Corentin Noël <corentin.n...@collabora.com>
Date: Mon Nov 6 14:29:56 2023 +0100
frontends/va: Remove wrong use of ProfileToPipe
The `context->templat.profile` variable is already of enum pipe_video_profile.
Fixes: 0996ec3fc6e ("frontends/va: Add profile param when querying
PIPE_VIDEO_CAP_ENC_QUALITY_LEVEL")
Signed-off-by: Corentin Noël <corentin.n...@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26067>
(cherry picked from commit f4ed92a8236f611b5a8be9f542d81c5a5e11578a)
---
.pick_status.json | 2 +-
src/gallium/frontends/va/picture.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 808371d2157..4ed98686374 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -284,7 +284,7 @@
"description": "frontends/va: Remove wrong use of ProfileToPipe",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "0996ec3fc6ea3ec3c76392f9aa15a283060f95fa",
"notes": null
diff --git a/src/gallium/frontends/va/picture.c
b/src/gallium/frontends/va/picture.c
index 4c9339ff481..ffedf77d0c8 100644
--- a/src/gallium/frontends/va/picture.c
+++ b/src/gallium/frontends/va/picture.c
@@ -1148,7 +1148,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID
context_id)
context->desc.h264enc.frame_num_cnt++;
/* keep other path the same way */
- if (!screen->get_video_param(screen,
ProfileToPipe(context->templat.profile),
+ if (!screen->get_video_param(screen, context->templat.profile,
context->decoder->entrypoint,
PIPE_VIDEO_CAP_ENC_QUALITY_LEVEL)) {
