From c4061bb5fa1c15a77ded16f1de3a4bfa2df20384 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Tue, 15 Aug 2017 12:58:59 -0400 Subject: [PATCH] st/va: reallocate surface when interlaced MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/state_trackers/va/picture.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index 62a30782aa3..732079139ea 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -589,6 +589,8 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) vlVaBuffer *coded_buf; vlVaSurface *surf; void *feedback; + struct pipe_screen *screen; + bool interlaced; if (!ctx) return VA_STATUS_ERROR_INVALID_CONTEXT; @@ -615,6 +617,26 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) surf = handle_table_get(drv->htab, context->target_id); context->mpeg4.frame_num++; + screen = context->decoder->context->screen; + interlaced = screen->get_video_param(screen, context->decoder->profile, + PIPE_VIDEO_ENTRYPOINT_BITSTREAM, + PIPE_VIDEO_CAP_SUPPORTS_INTERLACED); + + if (surf->buffer->interlaced != interlaced) { + surf->templat.interlaced = screen->get_video_param(screen, context->decoder->profile, + PIPE_VIDEO_ENTRYPOINT_BITSTREAM, + PIPE_VIDEO_CAP_PREFERS_INTERLACED); + + surf->buffer->destroy(surf->buffer); + + if (vlVaHandleSurfaceAllocate(ctx, surf, &surf->templat) != VA_STATUS_SUCCESS) { + mtx_unlock(&drv->mutex); + return VA_STATUS_ERROR_ALLOCATION_FAILED; + } + + context->target = surf->buffer; + } + if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) { coded_buf = context->coded_buf; getEncParamPreset(context); -- 2.30.2