From 15d4d44d9b2467484b95f71d76224b7de2da5e40 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Mon, 28 Aug 2017 23:07:33 -0400 Subject: [PATCH] st/va: move YUV content to deinterlaced buffer when reallocated for encoder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: use deinterlace common function v3: make sure deinterlace only Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/state_trackers/va/picture.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index ee099fad6ee..19df52cb83e 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -660,13 +660,22 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) } if (realloc) { - surf->buffer->destroy(surf->buffer); + struct pipe_video_buffer *old_buf = surf->buffer; if (vlVaHandleSurfaceAllocate(ctx, surf, &surf->templat) != VA_STATUS_SUCCESS) { mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } + if (context->decoder->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) { + if (old_buf->interlaced) + vl_compositor_yuv_deint(&drv->cstate, &drv->compositor, old_buf, surf->buffer); + else + /* Can't convert from progressive to interlaced yet */ + return VA_STATUS_ERROR_INVALID_SURFACE; + } + + old_buf->destroy(old_buf); context->target = surf->buffer; } -- 2.30.2