fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-18 17:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

frontends/va: Check if target buffer is supported in EndPicture

Browse source 
Check for all entrypoints, not just encode.

Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32089>
This commit is contained in:
David Rosca 2024-11-12 11:47:43 +01:00 • committed by Marge Bot
parent 7925f13a41
commit 6bd21e4a06
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gallium/frontends/va/picture.c
View file

@ -1137,6 +1137,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
bool apply_av1_fg = false;
struct pipe_video_buffer **out_target;
int output_id;
enum pipe_format target_format;
if (!ctx)
return VA_STATUS_ERROR_INVALID_CONTEXT;
@ -1202,8 +1203,9 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
*out_target = surf->buffer;
}
target_format = context->target->buffer_format;
if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
struct pipe_screen *screen = context->decoder->context->screen;
coded_buf = context->coded_buf;
context->desc.base.fence = &coded_buf->fence;
if (u_reduce_video_profile(context->templat.profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC)
@ -1221,16 +1223,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
context->desc.base.output_format = surf->buffer->buffer_format;
}
context->desc.base.input_full_range = surf->full_range;
if (screen->is_video_target_buffer_supported &&
!screen->is_video_target_buffer_supported(screen,
context->desc.base.output_format,
context->target,
context->decoder->profile,
context->decoder->entrypoint)) {
mtx_unlock(&drv->mutex);
return VA_STATUS_ERROR_INVALID_SURFACE;
}
target_format = context->desc.base.output_format;
if (coded_buf->coded_surf)
coded_buf->coded_surf->coded_buf = NULL;
@ -1260,6 +1253,16 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
context->desc.base.fence = &surf->fence;
}
if (screen->is_video_target_buffer_supported &&
!screen->is_video_target_buffer_supported(screen,
target_format,
context->target,
context->decoder->profile,
context->decoder->entrypoint)) {
mtx_unlock(&drv->mutex);
return VA_STATUS_ERROR_INVALID_SURFACE;
}
/* when there are external handles, we can't set PIPE_FLUSH_ASYNC */
if (context->desc.base.fence)
context->desc.base.flush_flags = drv->has_external_handles ? 0 : PIPE_FLUSH_ASYNC;