From 9f32078c2080bbe49eb071ab0eeec493159b7261 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Mon, 28 Aug 2017 21:05:03 -0400 Subject: [PATCH] st/omx: use vl/compositor helper function for YUV deinterlacing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: separate helper function in different patch Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/state_trackers/omx/vid_dec.c | 32 ++---------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/gallium/state_trackers/omx/vid_dec.c b/src/gallium/state_trackers/omx/vid_dec.c index 313bc0aa8bd..28741c09a42 100644 --- a/src/gallium/state_trackers/omx/vid_dec.c +++ b/src/gallium/state_trackers/omx/vid_dec.c @@ -579,34 +579,6 @@ static void vid_dec_FillOutput(vid_dec_PrivateType *priv, struct pipe_video_buff } } -static void vid_dec_deint(vid_dec_PrivateType *priv, struct pipe_video_buffer *src_buf, - struct pipe_video_buffer *dst_buf) -{ - struct vl_compositor *compositor = &priv->compositor; - struct vl_compositor_state *s = &priv->cstate; - struct pipe_surface **dst_surface; - struct u_rect dst_rect; - - dst_surface = dst_buf->get_surfaces(dst_buf); - vl_compositor_clear_layers(s); - - dst_rect.x0 = 0; - dst_rect.x1 = src_buf->width; - dst_rect.y0 = 0; - dst_rect.y1 = src_buf->height; - - vl_compositor_set_yuv_layer(s, compositor, 0, src_buf, NULL, NULL, true); - vl_compositor_set_layer_dst_area(s, 0, &dst_rect); - vl_compositor_render(s, compositor, dst_surface[0], NULL, false); - - dst_rect.x1 /= 2; - dst_rect.y1 /= 2; - - vl_compositor_set_yuv_layer(s, compositor, 0, src_buf, NULL, NULL, false); - vl_compositor_set_layer_dst_area(s, 0, &dst_rect); - vl_compositor_render(s, compositor, dst_surface[1], NULL, false); -} - static void vid_dec_FrameDecoded(OMX_COMPONENTTYPE *comp, OMX_BUFFERHEADERTYPE* input, OMX_BUFFERHEADERTYPE* output) { @@ -642,8 +614,8 @@ static void vid_dec_FrameDecoded(OMX_COMPONENTTYPE *comp, OMX_BUFFERHEADERTYPE* new_vbuf = priv->pipe->create_video_buffer(priv->pipe, &templat); /* convert the interlaced to the progressive */ - vid_dec_deint(priv, input->pInputPortPrivate, new_vbuf); - priv->pipe->flush(priv->pipe, NULL, 0); + vl_compositor_yuv_deint(&priv->cstate, &priv->compositor, + input->pInputPortPrivate, new_vbuf); /* set the progrssive buffer for next round */ vbuf->destroy(vbuf); -- 2.30.2