mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-14 13:21:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapisink: fix creation of GLX texture.

Browse source 
Fix creation of GLX texture, to not depend on the GstCaps video size that
could be wrong, especially in presence of frame cropping. So, use the size
from the source VA surfaces.

An optimization could be to reduce the texture size to the actual visible
size on screen. i.e. scale down the texture size to match the screen dimensions,
while preserving the VA surface aspect ratio. However, some VA drivers don't
honour that.
This commit is contained in:
Gwenole Beauchesne 2013-07-08 18:32:00 +02:00
parent 0b1faa62d0
commit 40b6832b82
1 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/vaapi/gstvaapisink.c
View file

@ -884,6 +884,42 @@ render_reflection(GstVaapiSink *sink)
glEnd();
}
static gboolean
gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface)
{
GstVideoRectangle tex_rect, dis_rect, out_rect;
guint width, height;
if (sink->texture)
return TRUE;
gst_vaapi_surface_get_size(surface, &width, &height);
tex_rect.x = 0;
tex_rect.y = 0;
tex_rect.w = width;
tex_rect.h = height;
gst_vaapi_display_get_size(sink->display, &width, &height);
dis_rect.x = 0;
dis_rect.y = 0;
dis_rect.w = width;
dis_rect.h = height;
gst_video_sink_center_rect(tex_rect, dis_rect, &out_rect, TRUE);
/* XXX: use surface size for now since some VA drivers have issues
with downscaling to the provided texture size. i.e. we should be
using the resulting out_rect size, which preserves the aspect
ratio of the surface */
width = tex_rect.w;
height = tex_rect.h;
GST_INFO("texture size %ux%u", width, height);
sink->texture = gst_vaapi_texture_new(sink->display,
GL_TEXTURE_2D, GL_BGRA, width, height);
return sink->texture != NULL;
}
static gboolean
gst_vaapisink_show_frame_glx(
GstVaapiSink *sink,
@ -897,17 +933,8 @@ gst_vaapisink_show_frame_glx(
GLuint texture;
gst_vaapi_window_glx_make_current(window);
if (!sink->texture) {
sink->texture = gst_vaapi_texture_new(
sink->display,
GL_TEXTURE_2D,
GL_BGRA,
sink->video_width,
sink->video_height
);
if (!sink->texture)
goto error_create_texture;
}
if (!gst_vaapisink_ensure_texture(sink, surface))
goto error_create_texture;
if (!gst_vaapi_texture_put_surface(sink->texture, surface, flags))
goto error_transfer_surface;